Mon, 24 Apr 2017 14:15:07 -0700
+
ubuntu-release-upgrader (1:17.04.7) zesty; urgency=medium
* No change rebuild to update promotions, demotions, and mirror lists.
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/DevelReleaseAnnouncement ubuntu-release-upgrader-17.10.1/DistUpgrade/DevelReleaseAnnouncement
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/DevelReleaseAnnouncement 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/DevelReleaseAnnouncement 2017-04-24 21:12:14.000000000 +0000
@@ -1,4 +1,4 @@
-= Welcome to the Ubuntu 'Zesty Zapus' development release =
+= Welcome to the Ubuntu 'Artful Aardvark' development release =
''This release is still in development.''
''Do not install it on production machines.''
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/DevelReleaseAnnouncement.html ubuntu-release-upgrader-17.10.1/DistUpgrade/DevelReleaseAnnouncement.html
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/DevelReleaseAnnouncement.html 2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/DevelReleaseAnnouncement.html 2017-04-24 21:15:07.000000000 +0000
@@ -3,12 +3,12 @@
-Welcome to the Ubuntu 'Zesty Zapus' development release
+Welcome to the Ubuntu 'Artful Aardvark' development release
-Welcome to the Ubuntu 'Zesty Zapus' development release
+Welcome to the Ubuntu 'Artful Aardvark' development release
This release is still in development.
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-17.10.1/DistUpgrade/DistUpgradeVersion.py
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/DistUpgradeVersion.py 2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/DistUpgradeVersion.py 2017-04-24 21:15:07.000000000 +0000
@@ -1 +1 @@
-VERSION = '17.04.7'
+VERSION = '17.10.1'
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/EOLReleaseAnnouncement ubuntu-release-upgrader-17.10.1/DistUpgrade/EOLReleaseAnnouncement
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/EOLReleaseAnnouncement 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/EOLReleaseAnnouncement 2017-04-24 21:12:29.000000000 +0000
@@ -1,4 +1,4 @@
-= Ubuntu 17.04 'Zesty Zapus' is no longer supported =
+= Ubuntu 17.10 'Artful Aardvark' is no longer supported =
You are about to upgrade to a version of Ubuntu that is no longer
supported.
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/EOLReleaseAnnouncement.html ubuntu-release-upgrader-17.10.1/DistUpgrade/EOLReleaseAnnouncement.html
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/EOLReleaseAnnouncement.html 2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/EOLReleaseAnnouncement.html 2017-04-24 21:15:07.000000000 +0000
@@ -3,12 +3,12 @@
-Ubuntu 17.04 'Zesty Zapus' is no longer supported
+Ubuntu 17.10 'Artful Aardvark' is no longer supported
-Ubuntu 17.04 'Zesty Zapus' is no longer supported
+Ubuntu 17.10 'Artful Aardvark' is no longer supported
You are about to upgrade to a version of Ubuntu that is no longer
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/gtkbuilder/DistUpgrade.ui ubuntu-release-upgrader-17.10.1/DistUpgrade/gtkbuilder/DistUpgrade.ui
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/gtkbuilder/DistUpgrade.ui 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/gtkbuilder/DistUpgrade.ui 2017-04-24 21:09:22.000000000 +0000
@@ -1155,7 +1155,7 @@
True
False
0
- <b><big>Upgrading Ubuntu to version 17.04</big></b>
+ <b><big>Upgrading Ubuntu to version 17.10</big></b>
True
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/ReleaseAnnouncement ubuntu-release-upgrader-17.10.1/DistUpgrade/ReleaseAnnouncement
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/ReleaseAnnouncement 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/ReleaseAnnouncement 2017-04-24 21:11:09.000000000 +0000
@@ -1,9 +1,9 @@
-= Welcome to Ubuntu 17.04 'Zesty Zapus' =
+= Welcome to Ubuntu 17.10 'Artful Aardvark' =
-The Ubuntu team is proud to announce Ubuntu 17.04 'Zesty Zapus'.
+The Ubuntu team is proud to announce Ubuntu 17.10 'Artful Aardvark'.
To see what's new in this release, visit:
- https://wiki.ubuntu.com/ZestyZapus/ReleaseNotes
+ https://wiki.ubuntu.com/ArtfulAardvark/ReleaseNotes
Ubuntu is a Linux distribution for your desktop or server, with a fast
and easy install, regular releases, a tight selection of excellent
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/ReleaseAnnouncement.html ubuntu-release-upgrader-17.10.1/DistUpgrade/ReleaseAnnouncement.html
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/ReleaseAnnouncement.html 2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/ReleaseAnnouncement.html 2017-04-24 21:15:07.000000000 +0000
@@ -3,21 +3,21 @@
-Welcome to Ubuntu 17.04 'Zesty Zapus'
+Welcome to Ubuntu 17.10 'Artful Aardvark'
-Welcome to Ubuntu 17.04 'Zesty Zapus'
+Welcome to Ubuntu 17.10 'Artful Aardvark'
-The Ubuntu team is proud to announce Ubuntu 17.04 'Zesty Zapus'.
+The Ubuntu team is proud to announce Ubuntu 17.10 'Artful Aardvark'.
To see what's new in this release, visit:
- https://wiki.ubuntu.com/ZestyZapus/ReleaseNotes
+ https://wiki.ubuntu.com/ArtfulAardvark/ReleaseNotes
Ubuntu is a Linux distribution for your desktop or server, with a fast
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/window_main.ui ubuntu-release-upgrader-17.10.1/DistUpgrade/window_main.ui
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/window_main.ui 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/DistUpgrade/window_main.ui 2017-04-24 21:10:03.000000000 +0000
@@ -236,7 +236,7 @@
-
- <b><big>Upgrading Ubuntu to version 17.04</big></b>
+ <b><big>Upgrading Ubuntu to version 17.10</big></b>
false
diff -Nru ubuntu-release-upgrader-17.04.7/po/af.po ubuntu-release-upgrader-17.10.1/po/af.po
--- ubuntu-release-upgrader-17.04.7/po/af.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/af.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: af\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Bediener vir %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hoofbediener"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Gebruikersspesifieke bedieners"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Kon nie sources.list inskrywing bereken nie"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Kon nie enige pakkette opspoor nie. Hierdie is dalk nie 'n Ubuntu Skyf nie "
"of van die verkeerde argitektuur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Misluk om die CD toe te voeg"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Die foutboodskap was:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Verwyder pakket in swak toestand"
msgstr[1] "Verwyder pakette in swak toestand"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Die bediener is dalk oorlaai"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Gebroke pakette"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"maak voordat u voort gaan."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -124,27 +124,27 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Hierdie is heel waarskynlik 'n tydelike probleem, probeer asseblief later "
"weer."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Kon nie die opgradering bereken nie"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fout by bepaling van die egtheid van sommige pakkette"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -154,7 +154,7 @@
"tydelike netwerkprobleem. Probeer later weer. Sien hieronder vir 'n lys van "
"ongestaafde pakkette."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -162,32 +162,32 @@
"Die pakket '%s' is gemerk vir verwydering, maar dit is op die verwyderings-"
"swartlys."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Die noodsaaklike pakket '%s' is gemerk vir verwydering."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Probeer tans om die swartlys weergawe '%s' te installeer."
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Kan nie '%s' installeer nie."
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Kan nie 'n meta-paket raai nie"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -473,7 +473,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Bereken die veranderinge"
@@ -493,7 +493,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Kon nie die opgraderings aflaai nie"
@@ -505,33 +505,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Oorspronklike stelseltoestand word herstel"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Kon nie die opgraderings installeer nie"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -542,26 +542,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Verouderde pakkette verwyder?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Behou"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Sk_rap"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -571,45 +571,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kontrolleer pakketbestuurder"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Misluk om die opgradering voor te berei"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -617,7 +617,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -626,23 +626,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Stoorplek inligting word opgedateer"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ongeldige pakketinligting"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -654,40 +654,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Haal tans"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Besig om op te gradeer"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Opgradering voltooi"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Soek na verouderde sagteware"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sisteem-opgradering voltooi."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Die gedeeltelike opgradering is voltooi."
@@ -716,43 +716,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Kon nie die opgradering-nutsprogram loop nie."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Opgradering-nutsprogram"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Stawing het misluk"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -760,21 +760,21 @@
"Stawing van die opgradering het misluk. Daar is moontlik 'n probleem met die "
"netwerkverbinding of die bediener. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifikasie het misluk"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -782,18 +782,18 @@
"Verifikasie van die opgradering het misluk. Daar is moontlik 'n probleem met "
"die netwerkverbinding of die bediener. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Kan nie die opgradering loop nie"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Die foutboodskap is '%s'."
@@ -887,11 +887,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -899,11 +899,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Geen ARMv6 verwerker"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -911,11 +911,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -925,11 +925,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1620,11 +1620,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1692,20 +1692,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s opgradering beskikbaar"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/am.po ubuntu-release-upgrader-17.10.1/po/am.po
--- ubuntu-release-upgrader-17.04.7/po/am.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/am.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: am\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "ሰርቨር ለ %s"
@@ -28,31 +28,31 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ዋናው ሰርቨር"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "ልማዳዊ ሰርቨሮች"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "የምንጩን ዝርዝር አገባብ ማስላት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
"የጥቅል ፋይሎችን ማግኘት አልተቻለም ፡ ምናልባት ይህ የኡቡንቱ ዲስክ ላይሆን ይችላል ወይም የተሳሳተ አሰራር ይሆን?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "ሲዲ መጨመር አልተቻለም"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -66,13 +66,13 @@
"የስህተቱ መልእክት \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "በመጥፎ ሁኔታ ላይ ያለን ጥቅል ማስወገጃ"
msgstr[1] "በመጥፎ ሁኔታ ላይ ያሉትን ጥቅሎች ማስወገጃ"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -91,15 +91,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "ሰርቨሩ ከአቅሙ በላይ ተጭኗል"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "የተሰበሩ ጥቅሎች"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -108,7 +108,7 @@
"ጌትን በመጠቀም ስብራቱን ያስተካክሉ"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -126,63 +126,69 @@
" * ያልታወቁ ጥቅሎች በ ኡቡንቱ ያልቀረቡ ሊሆን ይችላል\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "ይህ ትንሽ ጊዜ የሚቆይ ችግር ነው ፤ እባክዎ እንደገና ይሞክሩ ትንሽ ቆይተው"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
+"እነዚህ የማይፈጸሙ ከሆነ: እባክዎን ችግሩን ያመልክቱ በ መጠቀም ትእዛዝ 'ubuntu-bug ubuntu-release-"
+"upgrader-core' በ ተርሚናል ውስጥ"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "ማሻሻያውን ማስላት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "ስህተት በማረጋገጥ ላይ አንዳንድ ጥቅሎችን"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
+"አንዳንድ ጥቅሎችን ማረጋገጥ አልተቻለም: ይህ የሚፈጠረው ምናልባት በ ጊዚያዊ የ ኔትዎርክ ችግር ሊሆን ይችላል: እርስዎ "
+"ትንሽ ቆይተው ይሞክሩ: ያልተረጋገጡ ጥቅሎችን ከ ታች በኩል በ ዝርዝር ውስጥ ይመልከቱ"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "ጥቅሉ '%s' ምልክት ተድርጎበታል ለማስወገድ ነገር ግን ከሚወገዱት ዝርዝሮች ውስጥ አለ"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "በጣም አስፈላጊ ጥቅል '%s' ለማስወገድ ምልክት ተደርጎበታል"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "ለመግጠም በመሞከር ላይ በመጥፎ ዝርዝር እትም ውስጥ ካሉ '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "መግጠም አልተቻለም '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
+"የ ተፈለገውን ጥቅል መግጠም አልተቻለም: እባክዎን ይህን ችግር ያመልክቱ በ መጠቀም 'ubuntu-bug ubuntu-"
+"release-upgrader-core' በ ተርሚናል ውስጥ"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "ስለ-ጥቅል መገመት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -190,6 +196,8 @@
" Please install one of the packages above first using synaptic or apt-get "
"before proceeding."
msgstr ""
+"የ እርስዎ ስርአት %s ወይንም %s ጥቅል እና ማግኘት አልተቻለም የትኛውን የ ኡቡንቱ እትም እንደሚያስኬዱ: እባክዎን "
+"አንዱን ጥቅል ይግጠሙ ከ ላይ ያለውን አንዱን synaptic ወይንም apt-get ከ መቀጠልዎ በፊት"
#: ../DistUpgrade/DistUpgradeController.py:119
msgid "Reading cache"
@@ -197,7 +205,7 @@
#: ../DistUpgrade/DistUpgradeController.py:226
msgid "Unable to get exclusive lock"
-msgstr ""
+msgstr "በትክክል መቆለፍ አልተቻለም"
#: ../DistUpgrade/DistUpgradeController.py:227
msgid ""
@@ -219,6 +227,10 @@
"\n"
"The upgrade will abort now. Please try without ssh."
msgstr ""
+"እርስዎ ማሻሻያ እይስኬዱ ያሉት በ remote ssh ንኙነት ነው: ይህን በማይደግፍ ወደ ፊት በ መጣ: እባክዎን በ "
+"ጽሁፍ ዘዴ ለ ማሻሻል ይሞክሩ 'do-release-upgrade'.\n"
+"\n"
+"ይህ ማሻሻያ አሁን ይቋረጣል: እባክዎን ይሞክሩ ያለ ssh."
#: ../DistUpgrade/DistUpgradeController.py:300
msgid "Continue running under SSH?"
@@ -234,6 +246,11 @@
"If you continue, an additional ssh daemon will be started at port '%s'.\n"
"Do you want to continue?"
msgstr ""
+"ይህ ክፍለ ጊዜ እየሄደ ያለው በ ssh. ስር ነው: ይህን አንመክርም ማሻሻያ በ ssh ስር መፈጸም: ምክንያቱም ምናልባት "
+"ባይሳካ ወደ ነበረበት መመለስ አይቻልም\n"
+"\n"
+"እርስዎ ከ ቀጠሉ ተጨማሪ የ ssh daemon ይጀምራል በ port '%s'.\n"
+"በ እርግጥ መቀጠል ይፈልጋሉ?"
#: ../DistUpgrade/DistUpgradeController.py:315
msgid "Starting additional sshd"
@@ -246,6 +263,8 @@
"started on port '%s'. If anything goes wrong with the running ssh you can "
"still connect to the additional one.\n"
msgstr ""
+"እንደ ነበር ለ መመለስ ድንገት ካልተሳካ: ተጨማሪ የ sshd ይጀምራል በ port '%s'. ማንኛውም አይነት ችግር "
+"ቢፈጠር ssh በማስኬድ ላይ እንዳለ እርስዎ መገናኘት ይችላሉ ከ ተጨማሪው ጋር\n"
#: ../DistUpgrade/DistUpgradeController.py:324
#, python-format
@@ -255,6 +274,9 @@
"with e.g.:\n"
"'%s'"
msgstr ""
+"እርስዎ የሚያስኬዱ ከሆነ የ ፋየርዎል: እርስዎ ለጊዜው port መክፈት አለብዎት: ይህ አደገኛ ቢሆንም ራሱ በራሱ መፈጸም "
+"አይችልም: እርስዎ መክፈት ይችላሉ port ለምሳሌ:\n"
+"'%s'"
#: ../DistUpgrade/DistUpgradeController.py:397
#: ../DistUpgrade/DistUpgradeController.py:442
@@ -287,6 +309,10 @@
"*No* changes written to a system directory from now until the next reboot "
"are permanent."
msgstr ""
+"ይህ ማሻሻያ የሚሄደው በ አሸዋ ሳጥን (መሞከሪያ) ዘዴ ውስጥ ነው: ሁሉም ለውጦች የሚጻፉት ወደ '%s' እና ይጠፋሉ "
+"በሚቀጥለው ጊዜ ሲገቡ\n"
+"\n"
+"*ምንም* ለውጦች አይጻፉም በ ስርአት ዳይሬክቶሪ ውስጥ ከ አሁን ጀምሮ እስከ እንደገና እስከሚገቡ ጊዜ ድረስ"
#: ../DistUpgrade/DistUpgradeController.py:443
msgid ""
@@ -306,6 +332,8 @@
"upgrade can not continue.\n"
"Please make sure that the system directory is writable."
msgstr ""
+"በ ስርአቱ ዳይሬክቶሪ ላይ መጻፍ ካልተቻለ '%s' በ እርስዎ መስሪያ ስርአት ላይ ማሻሻያ መቀጠል አይችልም\n"
+"እባክዎን እርግጠኛ ይሁኑ በ ስርአቱ ዳይሬክቶሪ ላይ መጻፍ እንደሚቻል"
#: ../DistUpgrade/DistUpgradeController.py:484
msgid "Include latest updates from the Internet?"
@@ -326,7 +354,7 @@
#: ../DistUpgrade/DistUpgradeController.py:659
#, python-format
msgid "Not for humans during development stage of release %s"
-msgstr ""
+msgstr "ለ ሰዎች አይደለም: ለ አበልፃጊዎች ደረጃ የ ተለቀቀ %s"
#: ../DistUpgrade/DistUpgradeController.py:744
#, python-format
@@ -362,6 +390,9 @@
"Should default entries for '%s' be added? If you select 'No', the upgrade "
"will cancel."
msgstr ""
+"የ እርስዎን የ 'sources.list' ካሰሱ በኋላ ምንም ዋጋ ያለው የ '%s' አልተገኘም\n"
+"\n"
+"ነባር ማስገቢያ ለ '%s' ልጨምር? እርስዎ ከ መረጡ 'አይ': ማሻሻያው ይሰረዛል"
#: ../DistUpgrade/DistUpgradeController.py:858
#: ../DistUpgrade/DistUpgradeController.py:864
@@ -372,13 +403,15 @@
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
-msgstr ""
+msgstr "የ ማጠራቀሚያ መረጃ በ ማሻሻል ላይ እንዳለ ዋጋ የሌለው ፋይል ተገኝቷል: የ ችግር መግለጫ በሂደት ላይ ነው"
#: ../DistUpgrade/DistUpgradeController.py:865
msgid ""
"Upgrading the repository information resulted in a invalid file. To report a "
"bug install apport and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
+"የ ማጠራቀሚያ መረጃ በ ማሻሻል ላይ እንዳለ ዋጋ የሌለው ፋይል ተገኝቷል: ችግሩን ለማሳወቅ apport ይግጠሙ እና ይህን "
+"ይፈጽሙ 'apport-bug ubuntu-release-upgrader'."
#: ../DistUpgrade/DistUpgradeController.py:874
msgid "Third party sources disabled"
@@ -390,6 +423,8 @@
"enable them after the upgrade with the 'software-properties' tool or your "
"package manager."
msgstr ""
+"አንዳንድ የ ሶስተኛ ፓርቲ ማስገቢያዎች በ እርስዎ የ ምንጭ ዝርዝር ውስጥ ተሰናክለዋል: እርስዎ እንደገና-ማስቻል ይችላሉ "
+"ከ ተሻሻለ በኋላ በ ሶፍትዌር-ባህሪዎች መሳሪያዎች ወይንም በ እርስዎ የ ጥቅል አስተዳዳሪ'"
#: ../DistUpgrade/DistUpgradeController.py:916
msgid "Package in inconsistent state"
@@ -438,11 +473,14 @@
"your trash and remove temporary packages of former installations using 'sudo "
"apt-get clean'."
msgstr ""
+"ማሻሻያው ተቋርጧል: ማሻሻያው በ ጠቅላል %s ነፃ ቦታ በ ዲስክ ላይ ይፈልጋል '%s'. እባክዎን ነፃ ቦታ ይፍጠሩ %s "
+"የ ዲስክ ቦታ '%s'. የ እርስዎን ቆሻሻ ፋይል ባዶ በማድረግ: እና ጊዚያዊ ጥቅል ፋይሎች በማስወገድ ይህን ይጠቀሙ "
+"'sudo apt-get clean'."
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "ለውጦቹን በማስላት ላይ"
@@ -459,10 +497,10 @@
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
-msgstr ""
+msgstr "ማሻሻያው አሁን ይሰረዛል እና ስርአቱ ወደ ነበረበት ሁኔታ ይመለሳል: እርስዎ ትንሽ ቆይተው እንደገና ይሞክሩ"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "የማሻሻያውን ጭነት ማውረድ አልተቻለም"
@@ -471,36 +509,40 @@
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
msgstr ""
+"ማሻሻያው ተቋርጧል: እባክዎን የ ኢንተርኔት ግንኙነት ይመርምሩ ወይንም የ መግጠሚያ አካሉን እና እንደገና ይሞክሩ: ሁሉም "
+"የ ወረዱ ፋይሎች ተቀምጠዋል"
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "በመፈጸም ላይ ስህተት"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "መጀመሪያ ወደነበረበት ስርአት መመለሰ"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "ማሻሻያውን መግጠም አልተቻለም"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
+"ማሻሻሉ ተቋርጧል: የ እርስዎ ስርአት በ ተረጋጋ ሁኔታ ላይ አይደለም: ስለዚህ እንደገና ማግኛ አሁን ይሄዳል (dpkg --"
+"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -510,28 +552,34 @@
"and attach the files in /var/log/dist-upgrade/ to the bug report.\n"
"%s"
msgstr ""
+"\n"
+"\n"
+"እባክዎን ችግሩን ያሳውቁን በ መቃኛ በ http://bugs.launchpad.net/ubuntu/+source/ubuntu-"
+"release-upgrader/+filebug and attach the files in /var/log/dist-upgrade/ to "
+"the bug report.\n"
+"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
"ማሻሻያው ተቋርጧል: እባክዎን የ ኢንተርኔት ግንኙነት ይመርምሩ ወይንም የ መግጠሚያ አካሉን እንደገና ይሞክሩ "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "ላስወግዳቸው አሮጌ ጥቅሎችን?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_ማስቀመጥ"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_ማስወገጃ"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -539,34 +587,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "የሚያስፈልጉት ጥገኞች አልተገጠሙም"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "የሚያስፈልጉት ጥገኞች '%s' አልተገጠሙም "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "የጥቅል አስተዳዳሪን በመመርመር ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "ማሻሻያውን ማሰናዳት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "ስርአቱን ለማሻሻል አልተቻለም ስለዚህ የ ችግር ማሳወቂያ ሂደት ተጀምሯል"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -574,20 +622,23 @@
"ስርአቱን ለማሻሻል አልተቻለም: ችግሩን ለማሳወቅ ይህን ይግጠሙ apport እና ይፈጽሙ 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
-msgstr ""
+msgstr "ማሻሻያ በ ቅድሚያ መጠየቅ አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
"\n"
"Additionally, a bug reporting process is being started."
msgstr ""
+"ይህ ስርአት ማሻሻያ በ ቅድሚያ መጠየቂያ ማግኘት አልቻለም: ማሻሻያው አሁን ይቋረጣል እና ወደ ነበረበት ሁኔታ ይመለሳል\n"
+"\n"
+"በ ተጨማሪ: የ ችግር መግለጫ ማሳወቂያ ሂደት ተጀምሯል"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -595,24 +646,28 @@
"To report a bug install apport and then execute 'apport-bug ubuntu-release-"
"upgrader'."
msgstr ""
+"ይህ ስርአት ማሻሻያ በ ቅድሚያ መጠየቂያ ማግኘት አልቻለም: ማሻሻያው አሁን ይቋረጣል እና ወደ ነበረበት ሁኔታ ይመለሳል\n"
+"\n"
+"የ ችግር መግለጫ ለማሳወቅ apport ይግጠሙ እና ከዛ ይፈጽሙ 'apport-bug ubuntu-release-"
+"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "የማስቀመጫውን መረጃ በማሻሻል ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "ሲዲ ራም መጨመር አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "አዝናለሁ ሲዲ ራም መጨመሩ አልተሳካም"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ዋጋ የሌለው የጥቅል መረጃ"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -624,40 +679,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "ሄዶ ማምጣት"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "በማሻሻል ላይ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "ማሻሻሉ ተጠናቋል"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "ማሻሻሉ ተፈጽሟል ነገር ግን ስህተት ተፈጥሯል በ ማሻሻያው ሂደት ውስጥ"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "ጊዜው ያለፈበትን ሶፍትዌር በመፈለግ ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "ስርአቱን ማሻሻል ተጠናቋል"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "በከፊል ማሻሻሉ ተጠናቋል"
@@ -686,80 +741,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "ማረጋገጫ '%(file)s' ለመከላከል '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "በማራገፍ ላይ '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "የማሻሻያውን መሳሪያዎች ማስኬድ አልተቻለም"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "የማሻሻያዎች መሳሪያዎች ፊርማ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "ማሻሻያ መሳሪያዎች"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "ሄዶ ማምጣት ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "ማሻሻያውን ሄዶ ማምጣት ወድቋል ፤ ምናልባት የኔትዎርክ ችግር ሊሆን ይችላል "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "ማጽደቂያው ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "ማሻሻያውን ማረጋገጥ አልተቻለም: ምናልባት የ ኔትዎርክ ወይንም የ ሰርቨር ችግር ሊሆን ይችላል "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "ለይቶ ማውጣት ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "ማሻሻያውን ለይቶ ማውጣት ወድቋል ፤ ምናልባት የኔትዎርክ ወይም የሰርቨር ችግር ሊሆን ይችላል "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "ማረጋገጫው ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "ማሻሻያውን ማረጋገጥ አልተቻለም: ምናልባት የ ኔትዎርክ ወይንም የ ሰርቨር ችግር ሊሆን ይችላል "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "ማሻሻያውን ማስኬድ አልተቻለም"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "የስህተቱ መልእክት ነው '%s'."
@@ -813,7 +868,7 @@
#: ../DistUpgrade/DistUpgradeQuirks.py:183
msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
-msgstr ""
+msgstr "የ እርስዎ graphics ጠንካራ አክል ሙሉ በ ሙሉ የ ተደገፈ ላይሆን ይችላል በ ኡቡንቱ 14.04."
#: ../DistUpgrade/DistUpgradeQuirks.py:185
msgid ""
@@ -828,7 +883,7 @@
#: ../DistUpgrade/DistUpgradeQuirks.py:209
msgid ""
"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
-msgstr ""
+msgstr "የ እርስዎ graphics hardware በ ሙሉ የተደገፈ አይደለም በ ኡቡንቱ 12.04 LTS."
#: ../DistUpgrade/DistUpgradeQuirks.py:211
msgid ""
@@ -843,6 +898,8 @@
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
msgstr ""
+"ማሻሻል የ ዴስክቶፕ ውጤቶችን ሊቀንስ ይችላል: ጨዋታዎች በሚጫወቱ ጊዜ ወይንም ሀይለኛ graphics ፕሮግራሞችን "
+"በሚጠቀሙ ጊዜ"
#: ../DistUpgrade/DistUpgradeQuirks.py:235
msgid ""
@@ -853,11 +910,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 ሲፒዩ አይደለም"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -865,11 +922,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
-msgstr ""
+msgstr "No ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -877,11 +934,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
-msgstr ""
+msgstr "ምንም ማስጀመሪያ ዝግጁ አይደለም"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -891,11 +948,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE አላስቻሉም"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -919,15 +976,15 @@
#: ../DistUpgrade/DistUpgradeMain.py:70
msgid "*DEPRECATED* this option will be ignored"
-msgstr ""
+msgstr "*DEPRECATED* ይህ ምርጫ ይተዋል"
#: ../DistUpgrade/DistUpgradeMain.py:73
msgid "Perform a partial upgrade only (no sources.list rewriting)"
-msgstr ""
+msgstr "በከፊል ማሻሻያ መፈጸሚያ (no sources.list rewriting)"
#: ../DistUpgrade/DistUpgradeMain.py:76
msgid "Disable GNU screen support"
-msgstr ""
+msgstr "የ GNU መመልከቻ ድጋፍ ማሰናከያ support"
#: ../DistUpgrade/DistUpgradeMain.py:78
msgid "Set datadir"
@@ -935,7 +992,7 @@
#: ../DistUpgrade/DistUpgradeMain.py:81
msgid "Upgrade to the development release"
-msgstr ""
+msgstr "ማሻሻያ ወደ አበልፃጊዎች እትም"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:145
#: ../DistUpgrade/DistUpgradeViewKDE.py:233
@@ -974,7 +1031,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk3.py:223
#: ../DistUpgrade/DistUpgradeViewKDE.py:303
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "የ ጥገኝነት ችግር - ሳይሰናድ መተው"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:228
#: ../DistUpgrade/DistUpgradeViewKDE.py:305
@@ -988,7 +1045,7 @@
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
"state. Please consider submitting a bug report about it."
-msgstr ""
+msgstr "ማሻያው ይቀጥላል ነገር ግን '%s' ጥቅሉ ላይሰራ ይችላል: እባክዎን ችግሩን ያስውቁ"
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk3.py:246
@@ -1006,7 +1063,7 @@
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
-msgstr ""
+msgstr "እርስዎ የ ቀየሩት ለውጦች በዚህ ማሰናጃ ውስጥ ይጠፋል እርስዎ አዲሱን እትም መቀየር ከ ፈለጉ"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:267
#: ../DistUpgrade/DistUpgradeViewKDE.py:352
@@ -1025,6 +1082,10 @@
"report. The upgrade has aborted.\n"
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
+"እባክዎን ችግሩን ያስውቁ (እስከ አሁን ካላሳወቁ) እና ፋይሎችን ያካትቱ /var/log/dist-"
+"upgrade/main.log and /var/log/dist-upgrade/apt.log in your report. The "
+"upgrade has aborted.\n"
+"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
#: ../DistUpgrade/DistUpgradeViewGtk3.py:555
msgid "Ctrl-c pressed"
@@ -1308,13 +1369,13 @@
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
-msgstr ""
+msgstr "ማሻሻያውን ለ መግጠም ትንሽ ሰአት ይወስዳል: ማውረዱ እንደጨረሰ: ሂደቱን መሰረዝ አይቻልም"
#: ../DistUpgrade/DistUpgradeView.py:409
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
-msgstr ""
+msgstr "ማሻሻያውን ለ መፈለግ እና ለ መግጠም ትንሽ ሰአት ይወስዳል: ማውረዱ እንደጨረሰ: ሂደቱን መሰረዝ አይቻልም"
#: ../DistUpgrade/DistUpgradeView.py:414
msgid "Removing the packages can take several hours. "
@@ -1457,6 +1518,9 @@
"The system could be in an unusable state if you cancel the upgrade. You are "
"strongly adviced to resume the upgrade."
msgstr ""
+"እየሄደ ያለውን ማሻሻያ ልሰርዘው?\n"
+"\n"
+"ማሻሻያውን መሰረዝ ስርአቱን ባልተረጋጋ ሁኔታ ላይ ያደርገዋል: ማሻሻያውን እንዲቀጥሉ እንመክራለን"
#: ../data/gtkbuilder/DistUpgrade.ui.h:6
msgid "_Start Upgrade"
@@ -1545,7 +1609,7 @@
msgid ""
"You can upgrade at a later time by opening Software Updater and click on "
"\"Upgrade\"."
-msgstr ""
+msgstr "እርስዎ ማሻሻል ይችላሉ በኋላ የ ሶፍትዌር ማሻሻያ በ መክፈት እና በ መጫን \"ማሻሻያ\""
#: ../data/com.ubuntu.release-upgrader.policy.in.h:1
msgid "Perform a release upgrade"
@@ -1573,7 +1637,7 @@
#: ../do-partial-upgrade:80 ../do-release-upgrade:98
msgid "Run the specified frontend"
-msgstr ""
+msgstr "የ ተወሰነውን ወደ ፊት የ መጣውን ማስኬጃ"
#: ../do-partial-upgrade:103
msgid "Running partial upgrade"
@@ -1583,14 +1647,14 @@
msgid "Downloading the release upgrade tool"
msgstr "በማውረድ ላይ የተለቀቀውን የማሻሻያ መሳሪያ"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
-msgstr ""
+msgstr "ወደ ዘመናዊው እትም ማሻሻል ይቻል እንደሆን ይመርምሩ"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
-msgstr ""
+msgstr "ወደ ዘመናዊው እትም ማሻሻል ይቻል እንደሆን ይሞክሩ ከ $distro-proposed"
#: ../do-release-upgrade:92
msgid ""
@@ -1598,10 +1662,12 @@
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
"for server systems are supported."
msgstr ""
+"የተለየ የ ማሻሻያ ዘዴ ያስኪዱ\n"
+"አሁን 'ዴስክቶፕ' ለ መደበኛ የ ዴስክቶፕ ስርአት ማሻሻያ እና 'ሰርቨር' ለ ተደገፉ የ ሰርቨር ስርአቶች"
#: ../do-release-upgrade:100
msgid "Test upgrade with a sandbox aufs overlay"
-msgstr ""
+msgstr "ማሻሻያ መሞከሪያ በ አሸዋ ሳጥን ውስጥ በ aufs overlay"
#: ../do-release-upgrade:103
msgid ""
@@ -1657,20 +1723,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "የሶፍትዌር ማሻሻያ"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "የኡቡንቱ %(version)s ማሻሻያ ዝግጁ ነው"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "እርስዎ አልተቀበሉም የ ኡቡንቱ ማሻሻያ %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/an.po ubuntu-release-upgrader-17.10.1/po/an.po
--- ubuntu-release-upgrader-17.04.7/po/an.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/an.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: an\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor ta %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor prencipal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidors presonalizaus"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "No se puet calcular a dentrada sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Imposible localizar garra paquete, a lo millor no ye un disco d'Ubuntu u no "
"ye l'arquitectura correcta"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Error al adibir o CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,13 +67,13 @@
"O mensache d'error estió:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Eliminar paquete en mal estau"
msgstr[1] "Eliminar paquetes en mal estau"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -94,15 +94,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "O servidor puet estar sobrecargau"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquetz crebaus"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"de continar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -123,25 +123,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Probablemén siga un problema pasachero, prebe de nuevo mas tardi."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "No s'ha puesto calcular l'esvielle"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error autenticando bels paquetz"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -151,7 +151,7 @@
"problema pasachero en o rete. prebe de nuevo mas tardi. veiga abaixo un "
"listau d'os paquetz no autenticaus."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -159,32 +159,32 @@
"O paquet «%s» ye marcau ta desinstalar-se pero ye en a lista negra de "
"desinstalación"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "O paquet esencial «%s» ha estau marcau ta la suya desinstalación"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Prebando d'instalar a versión vedada «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "No se ha puesto instalar «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "No s'ha puesto determinar o meta-paquet"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -460,7 +460,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -480,7 +480,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -492,33 +492,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -529,26 +529,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -556,45 +556,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -602,7 +602,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -611,23 +611,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -639,40 +639,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -701,80 +701,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -868,11 +868,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -880,11 +880,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -892,11 +892,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -906,11 +906,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1585,11 +1585,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1657,20 +1657,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ar.po ubuntu-release-upgrader-17.10.1/po/ar.po
--- ubuntu-release-upgrader-17.04.7/po/ar.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ar.po 2017-04-24 21:05:20.000000000 +0000
@@ -18,12 +18,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "خادوم %s"
@@ -31,30 +31,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "الخادوم الرئيسي"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "خواديم مخصصة"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "تعذر حساب مدخلة source.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "تعذّر إيجاد أي ملفات حزم، لعل هذا ليس قرص أوبونتو أو البنية الخطأ؟"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "فشلت إضافة الاسطوانة"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,7 +69,7 @@
"رسالة الخطأ كانت:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "أزل الحزمة التي في حالة سيئة"
@@ -79,7 +79,7 @@
msgstr[4] "أزل الحزم التي في حالة سيئة"
msgstr[5] "أزل الحزم التي في حالة سيئة"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -110,15 +110,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "قد يكون الخادوم مثقلاً."
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "حزم معطوبة"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -127,7 +127,7 @@
"أو apt-get قبل المواصلة."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -145,11 +145,11 @@
" * حزم برمجيات غير رسمية لا تقدمها أوبونتو\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "هذا على الأغلب عطل عابر، من فضلك حاول لاحقا."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -157,15 +157,15 @@
"إذا لم يكن أي من هذه مفيدًا، رجاءً أبلغ عن هذه العلة باستخدام الأمر 'ubuntu-"
"bug ubuntu-release-upgrader-core' في طرفية."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "تعذّر حساب الترقية"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "خطأ في استيثاق بعض الحزم"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -174,28 +174,28 @@
"تعذّر استيثاق بعض الحزم. قد تكون هذه مشكلة عابرة في الشبكة، وقد تفلح "
"المحاولة مجددا لاحقا. طالع قائمة الحزم غير المتوثقة أدناه."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "الحزمة '%s' معلّمة للإزالة لكنها في قائمة الحذف السوداء."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "الحزمة الأساسية '%s' معلّمة للإزالة."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "يحاول تثبيت نسخة في القائمة السوداء '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "تعذّر تثبيت '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -203,11 +203,11 @@
"كان من المستحيل تثبيت حزمة مطلوبة. رجاءً أبلغ عن هذه العلة باستخدام الأمر "
"'ubuntu-bug ubuntu-release-upgrader-core' في طرفية."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "تعذّرت معرفة الحزمة الفوقية"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -530,7 +530,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "يُحصي التغيرات"
@@ -552,7 +552,7 @@
"في وقت لاحق."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "تعذّر تنزيل الترقيات"
@@ -566,27 +566,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "عطل أثناء الإيداع"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "يسترجع الحالة الأصلية للنظام"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "تعذّر تثبيت الترقيات"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -594,7 +594,7 @@
"لقد أُجهضت الترقية. قد يصبح نظامك في خالة غير مستقرة. سيُشغل الاستعفاء الآن "
"(dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -611,27 +611,27 @@
"وأرفق الملفات الموجودة في /var/log/dist-upgrade/ في تقرير العلة.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
"لقد تم إلغاء الترقية. تحقق من اتصالك بالإنترنت أو وسيط التثبيت وحاول مجددا. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "أأزيل الحزم المبطلة؟"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "ا_ستبق"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "أ_زل"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -639,34 +639,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "اعتمادات مطلوبة غير مثبتة"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "الاعتمادية المطلوبة '%s' ليست مثبتة. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "يفحص مدير الحزم"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "فشل تجهيز الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "فشل تحضير النظام للترقية، لذلك يجري بدء عملية للإبلاغ عن العلّة."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -674,12 +674,12 @@
"فشل تحضير النظام للترقية. للإبلاغ عن المشكلة ثبّت apport ثم نفّذ الأمر "
"'apport-bug ubuntu-release-upgrader' في الطرفية."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "فشل جلب متطلبات الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -691,7 +691,7 @@
"\n"
"بالإضافة إلى ذلك، يجرى بدء عملية للإبلاغ عن العلّة."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,23 +705,23 @@
"للإبلاغ عن علّة، قم بتثبيت apport ثم نفّذ إجراء 'apport-bug ubuntu-release-"
"upgrader' في الطرفية."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "يحدّث معلومات المستودعات"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "فشل في إضافة القرص المدمج"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "عفواً، لم يتم إضافة القرص المدمج بنجاح."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "معلومات حزم غير صحيحة"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -740,40 +740,40 @@
"إذا كانت المشكلة بسبب الحِمل الزائد على الروابط البديلة، فربما عليك محاولة "
"الترقية لاحقا."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "يجلب"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "تجري الترقية"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "اكتملت الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "الترقية اكتملت، ولكن كان هناك أخطاء أثناء عملية الترقية."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "يبحث عن برمجيات قديمة"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "تمت ترقية النظام."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "اكتملت الترقية الجزئية."
@@ -802,17 +802,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "توثيق '%(file)s' باستخدام البصمة '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "يستخرج '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "تعذّر تشغيل أداة الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -820,58 +820,58 @@
"على الأرجح، هذا خطأ في أداة الترقية. رجاءً أبلغ عن هذه العلة باستخدام الأمر "
"'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "توقيع أداة الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "أداة الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "فشل الجلب"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "فشل جلب الترقية، قد تكون هناك مشكلة في الشبكة. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "فشل الاستيثاق"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "فشل استيثاق الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "فشل الاستخراج"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "فشل استخلاص الترقية، قد تكون هناك مشكلة في الشبكة أو الخادوم. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "فشل التحقق"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "فشل التحقق من الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "لا يمكن اجراء الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -879,7 +879,7 @@
"غالبًا ما يحدث هذا إذا ما تم تحميل /tmp بإشارة nonexec. رجاءً أعد التحميل "
"بدون nonexec ثم أعد تشغيل الترقية."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "رسالة الخطأ هي '%s'."
@@ -988,11 +988,11 @@
"\n"
"أتريد المواصلة؟"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "لا يوجد معالج i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1003,11 +1003,11 @@
"الحزم متطلبةً لبنية i686 كحد أدنى. ليس من الممكن ترقية نظامك إلى إصدارة "
"أوبونتو الجديدة مع هذا العتاد."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "لا معالج ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1018,11 +1018,11 @@
"مبنية لتعمل على الطراز ARMv6 كحد أدنى. من غير الممكن ترقية نظامك إلى إصدارة "
"أوبونتو حديثة مع هذا العتاد."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "لا يوجد عفريت مدير للعمليات"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1037,11 +1037,11 @@
"\n"
"هل حقاً تريد الاستمرار؟"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1796,11 +1796,11 @@
msgid "Downloading the release upgrade tool"
msgstr "ينزّل أداة الترقية"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "يتحقق إن كانت الترقية ممكنة إلى أحدث إصدارة تطوير"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "حاول الترقية إلى أحدث إصدارة باستخدام المحدِّث من $distro-proposed"
@@ -1875,20 +1875,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "شغّل 'do-release-upgrade' للترقية إليه."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "محدّث البرمجيات"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "يتوفر ترقية إلى أوبونتو %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "لقد رفضت الترقية إلى أوبونتو %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "أضف مُخرَجات التنقيح"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ast.po ubuntu-release-upgrader-17.10.1/po/ast.po
--- ubuntu-release-upgrader-17.04.7/po/ast.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ast.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ast\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Sirvidores pa %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Sirvidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Sirvidores personalizaos"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nun pudo calculase la entrada sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Nun puede llocalizase dengún paquete, seique nun ye un discu d'Ubuntu o nun "
"ye l'arquiteutura correuta."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Falló amestar el CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"El mensax d'error foi:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Desaniciar paquete en mal estáu"
msgstr[1] "Desaniciar paquetes en mal estáu"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "El sirvidor puede tar sobrocargáu"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquetes frayaos"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"software. Por favor ígualo enantes d'usar synaptic o apt-get"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,12 +130,12 @@
" * Paquetes non oficiales de software non proporcionaos por Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Dablemente seya un problema transitoriu, téntelo otra vegada más sero."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Si nada d'esto aplica, informa d'esti fallu usando la orde «ubuntu-bug "
"ubuntu-release-upgrader-core» nuna terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nun pue calculase l'anovamientu de versión"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error autentificando dalgunos paquetes"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"problema transitoriu na rede. Pruebe otra vegada más sero. Vea abaxo una "
"llista de los paquetes non autenticaos."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,22 +169,22 @@
"El paquete '%s' ta conseñáu pa desaniciar, pero ta na llista de non "
"desaniciables."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "El paquete esencial '%s' ta conseñáu pa desaniciar."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Intentando instalar la versión prohibida «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nun puede instalase '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -192,11 +192,11 @@
"Nun foi dable instalar un paquete requeríu. Informa d'esto como un fallu "
"usando «ubuntu-bug ubuntu-release-upgrader-core» nuna terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nun pudo determinase'l meta-paquete"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -524,7 +524,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculando los cambeos"
@@ -546,7 +546,7 @@
"orixinal. Pues reanudar l'anovamientu más sero."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nun se puede descargar les actualizaciones"
@@ -561,27 +561,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error durante la confirmación"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restaurando al estau del sistema orixinal"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nun pudieron instalase los anovamientos"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -589,7 +589,7 @@
"Encaboxóse l'anovamientu. Pue que'l sistema quedare nun estáu non usable. "
"Agora, va facese una recuperación (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -606,7 +606,7 @@
"axunta los ficheros en /var/log/dist-upgrade/ al informe.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -614,20 +614,20 @@
"Encaboxóse l'anovamientu. Por favor, comprueba la conexón a Internet o el "
"sofitu d'instalación y vuelvi a intentalo. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "¿Desaniciar paquetes obsoletos?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Caltener"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Esborrar"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -637,28 +637,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Dependencia requería nun ta instalada"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dependencia requería «%s» nun ta instalada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Comprobando'l xestor de paquetes"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Falló la tresna del anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -666,7 +666,7 @@
"Hebo un fallu al preparar el sistema pal anovamientu poro, ta arrancando un "
"procesu de notificación de fallos."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -674,12 +674,12 @@
"Falló la preparación del sistema pal anovamientu. Pa informar d'un fallu "
"instale apport y execute «apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Falló la tresna del anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -692,7 +692,7 @@
"\n"
"Adicionalmente, ta aniciándose un procesu de notificación d'errores."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -707,23 +707,23 @@
"Pa informar d'un fallu instale apport y execute «apport-bug ubuntu-release-"
"upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Anovando información del repositoriu"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Fallu al amestar el CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Sentímoslo, nun pudo amestase'l CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Información del paquete nun válida"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -735,40 +735,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Descargando"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Anovando"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Completóse l'anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "L'anovamientu completóse pero hebo fallos durante'l procesu."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Buscando software obsoletu"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "anovamientu del sistema completáu"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "L'anovamientu parcial completóse."
@@ -797,17 +797,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autentificar «%(file)s» escontra «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "estrayendo «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nun pudo executase la ferramienta d'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -815,27 +815,27 @@
"Lo más probable ye qu'esto seya un fallu na ferramienta d'anovamientos. "
"Informa d'esto cola orde «ubuntu-bug ubuntu-release-upgrader-core»."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Robla de la ferramienta d'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Ferramienta d'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Fallu al descargar"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Falló la baxada del anovamientu. Pue haber un problema cola rede. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Falló l'autentificación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -843,11 +843,11 @@
"Falló l'autentificación de l'anovamientu. Ye dable qu'heba un problema cola "
"rede o col sirvidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Fallu al sacar"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -855,11 +855,11 @@
"Falló la estraición del anovamientu. Pue haber un problema cola rede o col "
"sirvidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Falló la verificación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -867,12 +867,12 @@
"Falló la verificación del anovamientu. Pue haber un problema cola rede o col "
"sirvidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nun puede executase l'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -880,7 +880,7 @@
"Esto davezu cáusalo un sistema nel que /tmp se montó como non executable. "
"Vuelvi a montalu ensin «noexec» y executa otra vuelta l'anovamientu."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "El mensax de fallu ye «%s»"
@@ -994,11 +994,11 @@
"\n"
"¿Quier continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "La CPU nun ye i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1010,11 +1010,11 @@
"arquiteutura mínima. Nun ye posible anovar el sistema a una versión nueva "
"d'Ubuntu con esti hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1026,11 +1026,11 @@
"ARMv6 como arquiteutura mínima. Nun ye dable anovar el so sistema a la nueva "
"versión d'Ubuntu con esti hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "El degorriu init nun ta disponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1046,11 +1046,11 @@
"\n"
"¿Daveres que quies siguir?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nun ta activáu"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1779,11 +1779,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Descargar la ferramienta d'anovamientu del llanzamientu"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Comprobar si ye dable anovar a la cabera versión de desendolcu"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1861,20 +1861,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Executar 'do-release-upgrade' p'anovase a élli."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Anovamientu de software"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ta disponible l'anovamientu de versión a Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Decidisti nun anovar a Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Amestar resultáu de la depuración"
diff -Nru ubuntu-release-upgrader-17.04.7/po/az.po ubuntu-release-upgrader-17.10.1/po/az.po
--- ubuntu-release-upgrader-17.04.7/po/az.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/az.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: az\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s üçün Server"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Əsas server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Şəxsi Server"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Heçbir paket faylı tapılmadı, bu ya Ubuntu Diski deyil ya da quruluşu "
"səhvdir."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD-ni əlavə etmək mümkün olmadı"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Xəta məlumatı bu idi:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Pis (xarab) vəziyyətdə olan paketi sil."
msgstr[1] "Pis (xarab) vəziyyətdə olan paketləri sil."
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server həddən artıq yüklənmiş ola bilər"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Xarab paketlər"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"əvvəlcə onları synaptic və ya apt-get ilə düzəldin."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -123,64 +123,64 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Böyük ehtimalla, bu keçici problemdir. Xahiş edirik 1 az sonra cəhd edin"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Təzələmə hesablana bilmədi"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' qurula bilmir"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Meta-paketlər müəyyən olunabilmədi"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -434,7 +434,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -454,7 +454,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Yeniləmələr endirilə bilmədi"
@@ -466,33 +466,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Yeniləmələr qurula bilmədi"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -503,26 +503,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Saxla"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Sil"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -530,45 +530,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Paket idarəçisi yoxlanır"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Yeniləmənin hazırlanması alınmadı"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -576,7 +576,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -585,23 +585,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Saxlanc məlumatı yenilənir"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Xətalı paket məlumatı"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -613,40 +613,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Yenilənir"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistemin yenilənməsi başa çatdı."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -675,80 +675,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Təzələmə alətini işlətmək olmadı"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Təzələmə aləti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Alına bilmədi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "İxrac edilə bilmədi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -842,11 +842,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -854,11 +854,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -866,11 +866,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -880,11 +880,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1565,11 +1565,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1637,20 +1637,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/be.po ubuntu-release-upgrader-17.10.1/po/be.po
--- ubuntu-release-upgrader-17.04.7/po/be.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/be.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: be\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Сервер для %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Галоўны сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Адмысловыя серверы"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Немагчыма разлічыць запіс sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Немагчыма адшукаць ніводнага файла з пакетам, верагодна, гэты дыск не "
"з'яўляецца Ubuntu ці мае іншую архітэктуру."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Немагчыма дадаць дыск"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Тэкст памылкі:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Выдаліць пакет, пазначаны як памылковы"
msgstr[1] "Выдаліць пакеты, пазначаныя як памылковыя"
msgstr[2] "Выдаліць пакеты ў кепскім стане"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -98,15 +98,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Магчыма сервер перагружаны"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Пакеты з памылкамі"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -116,7 +116,7 @@
"перш чым працягваць."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -134,11 +134,11 @@
" * Пакеты неафіцыйнага праграмнага забеспячэння не ўваходзяць у Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Магчыма, гэта часовая праблема. Паспрабуйце паўтарыць пазней."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -147,15 +147,15 @@
"гэтай памылцы, выканаўшы каманду \"ubuntu-bug ubuntu-release-upgrader-core\" "
"у тэрмінале."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Немагчыма падлічыць абнаўленне"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Памылка аўтэнтыфікацыі некаторых пакетаў"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -165,28 +165,28 @@
"праблемы з сеткай. Вы можаце паспрабаваць паўтарыць дзеяньне пазней. "
"Глядзіце ніжэй спіс неаўтэнтыфікаваных пакетаў."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "Пакет “%s“ пазначаны для выдалення, але ён у чорным спісе выдалення."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Важны пакет “%s“ пазначаны для выдалення."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Спроба ўсталёўкі ўнесенай у чорны спіс версіі '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Немагчыма ўсталяваць \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -194,11 +194,11 @@
"Не атрымалася ўсталяваць патрэбны пакет. Паведаміце аб гэтай памылцы, "
"выкарыстаўшы каманду \"ubuntu-bug ubuntu-release-upgrader-core\" у тэрмінале."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Немагчыма вызначыць мета-пакет"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -524,7 +524,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Падлічыць змены"
@@ -546,7 +546,7 @@
"стану сістэмы. Вы можаце працягнуць гэта абнаўленне пазней."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Не атрымалася загрузіць абнаўленні"
@@ -561,27 +561,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Памылка пры фіксаванні"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Аднаўленне першапачатковага стану сістэмы"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Немагчыма ўсталяваць абнаўленні"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -590,7 +590,7 @@
"для нармальнага выкарыстання. Зараз будзе запушчаны працэс аднаўлення (dpkg -"
"-configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -607,7 +607,7 @@
"уклаўшы файлы з /var/log/dist-upgrade/ да справаздачы пра памылку..\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -615,20 +615,20 @@
"Абнаўленне спыненае. Калі ласка праверце злучэнне з Інтэрнэтам, альбо іншую "
"крыніцу ўсталёўкі і паспрабуйце зноў. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Выдаліць састарэлыя пакеты?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "За_хаваць"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Выдаліць"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -636,28 +636,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Неабходныя залежнасці не ўсталяваныя"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Неабходныя залежнасці \"%s\" не ўсталяваныя. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Праверка мэнэджара пакетаў"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Збой падрыхтоўкі да абнаўлення"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -665,7 +665,7 @@
"Падрыхтоўкі сістэмы да абнаўлення не атрымалася, будзе запушчана праграма "
"справаздач аб памылках."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -674,12 +674,12 @@
"памылку, усталюйце apport і выканайце каманду \"apport-bug ubuntu-release-"
"upgrader\"."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Падрыхтоўка да абнаўлення завяршылася няўдала"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -692,7 +692,7 @@
"\n"
"Выконваецца запуск паведамлення пра няспраўнасць."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,23 +705,23 @@
"Каб паведаміць пра памылку ўсталяваць apport, а затым выканайце 'apport-bug "
"ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Абнаўленне інфармацыі аб сховішчы"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Дадаванне кампакт-дыска завяршылася няўдала"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Выбачайце, даданне кампакт-дыска завяршылася няўдала."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Некарэктная інфармацыя аб пакеце"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -739,41 +739,41 @@
"забеспячэння ў /etc/apt/sources.list.\n"
"Калі люстэрка перагружана, можна зноў паспрабаваць абнавіцца пазней."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Атрыманне"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Абнаўленне"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Абнаўленне скончана"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Абнаўленне скончана, аднак падчас працэсу абнаўлення здарыліся памылкі."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Пошук састарэлых праграм"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Абнаўленне сістэмы завершана"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Частковае абнаўленне завершана."
@@ -802,17 +802,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "аўтэнтыфікаваць '%(file)s' замест '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "выманне '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Не атрымалася запусціць сродак абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -821,27 +821,27 @@
"Паведаміце аб гэтай памылцы з дапамогай каманды \"ubuntu-bug ubuntu-release-"
"upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Подпіс прылады абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Прылада абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Не магу атрымаць"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Не магу атрымаць абнаўленне. Магчыма, паўстала праблема з сецівам. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Няўдалая ідэнтыфікацыя"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -849,11 +849,11 @@
"Праверка ідэнтыфікацыі абнаўлення не атрымалася. Магчыма, паўстала праблема "
"з сецівам або на серверы. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Не магу выняць"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -861,11 +861,11 @@
"Не атрымалася выняць абнаўленне. Магчыма, паўстала праблема з сецівам або на "
"серверы. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Праверка не атрымалася"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -873,12 +873,12 @@
"Праверка абнаўлення завяршылася няўдала. Магчыма, паўстала праблема з "
"сецівам або на серверы. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Не атрымалася запусціць працэс абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -886,7 +886,7 @@
"Звычайна паўстае ў сістэме, дзе / tmp змантаваны пад noexec. Калі ласка, "
"перамантуйце без noexec і запусціце абнаўленне зноў."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Паведамленне аб памылцы «%s»."
@@ -999,11 +999,11 @@
"\n"
"Працягнуць?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Няма i686-сумяшчальнага працэсара"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1015,11 +1015,11 @@
"архітэктуру i686 і вышэй. Абнавіць вашу сістэму да новай версіі Ubuntu на "
"гэтым кампутары не атрымаецца."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Няма працэсара ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1031,11 +1031,11 @@
"ARMv6 і вышэй. Вашу сістэму немагчыма абнавіць да новага рэлізу Ubuntu з "
"бягучым апаратным забеспячэннем."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Служба init недаступна"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1049,11 +1049,11 @@
"\n"
"Вы ўпэўнены, што хочаце працягнуць?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE не ўключана"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1794,12 +1794,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Спампоўваецца праграма для абнаўлення дыстрыбутыва"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Праверка магчымасці абнаўлення да апошняй нестабільнай версіі дыстрыбутыва"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1879,20 +1879,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Выканайце «do-release-upgrade», каб абнавіцца да яго."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Прылада абнаўлення пакетаў"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Даступнае абнаўленне Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Вы адмовіліся ад абнаўлення да Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Дадаць дапаможную інфармацыю"
diff -Nru ubuntu-release-upgrader-17.04.7/po/bg.po ubuntu-release-upgrader-17.10.1/po/bg.po
--- ubuntu-release-upgrader-17.04.7/po/bg.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/bg.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: bg\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Сървър за %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Основен сървър"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Сървъри по избор"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Не може да пресметне запис в sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Намирането на програмни пакети не бе успешно. Вероятно това не е диск с "
"Убунту или е с неподходяща архитектура за вашата система?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Грешка при добавяне на CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,13 +70,13 @@
"Съобщението за грешка беше:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Премахни пакета в лошо състояние"
msgstr[1] "Премахни пакетите в лошо състояние"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -97,15 +97,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Сървърът може би е претоварен"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Повредени пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -115,7 +115,7 @@
"продължите."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,12 +133,12 @@
" * Неофициалният софтуер не се предоставя от Убунту\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Това най-вероятно е временен проблем. Моля, опитайте отново по-късно."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -147,15 +147,15 @@
"като изпълните командата «ubuntu-bug ubuntu-release-upgrader-core» в "
"терминала."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Не може да бъде изчислено надграждането"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Грешка при удостоверяване на автентичността за някои пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -165,7 +165,7 @@
"да е временен проблем с мрежата. Може би бихте искали да опитате отново по-"
"късно. Вижте по-долу списъка на неудоствоерените пакети."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -173,22 +173,22 @@
"Пакетът «%s» е маркиран за премахване, но той е в черния списък за "
"премахване."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Основният пакет «%s» е маркиран за премахване."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Опит на инсталиране на внесена в черния списък версия «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Не може да се инсталира «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -197,11 +197,11 @@
"като изпълните командата «ubuntu-bug ubuntu-release-upgrader-core» в "
"терминала."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Не могат да бъдат предположени мета-пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -525,7 +525,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Пресмятане на промените"
@@ -547,7 +547,7 @@
"състояние на системата. Можете да продължите надграждането по-късно."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Не могат да бъдат свалени надгражданията"
@@ -562,27 +562,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Грешка при прехвърляне"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Възстановяване на първоначалното състояние на системата"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Не можаха да бъдат инсталирани надгражданията"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -590,7 +590,7 @@
"Надграждането бе прекъснато. Системата ви може да е в нестабилно състояние. "
"Сега ще се извърши възстановяване (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -608,7 +608,7 @@
"към доклада си.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -616,20 +616,20 @@
"Надграждането бе прекъснато. Моля, проверете интернет връзката или "
"инсталационната среда и опитайте отново. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Да премахна ли остарелите пакети?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Задържи"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Премахни"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -639,28 +639,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Не са инсталирани необходимите зависимости"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Необходимата зависимост «%s» не е инсталирана. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Проверка на мениджъра на пакети"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Подготовката за надграждането бе неуспешна"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -668,18 +668,18 @@
"Възникна грешка по време на подготовката на системата към пълноценно "
"надграждане. Стартира процеса за докладване на грешки."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Грешка при получаване на изискванията за надграждане"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -692,7 +692,7 @@
"\n"
"Стартират системните съобщения за неизправност."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -701,23 +701,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Актуализиране на информацията от хранилището"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Неуспешно добавяне на компактдиск"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Съжаляваме, добавянето на компактдиск бе неуспешно."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Невалидна информация за пакета"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -736,40 +736,40 @@
"В случай на голямо натоварване на огледалото може да опитате да надградите "
"по-късно."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Получаване"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Надграждане"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Надграждането завърши"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Надграждането завърши, но възникнаха грешки по време на този процес."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Търсене на остарял софтуер"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Надграждането на системата завърши."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Частичното надграждане завърши."
@@ -798,17 +798,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "идентифициране на «%(file)s» вместо «%(signature)s'» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "разархивиране на «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Не може да бъде стартирана помощната програма за надграждане."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -817,29 +817,29 @@
"уведомите за това, като изпълните следната команда «ubuntu-bug ubuntu-"
"release-upgrader-core» в терминала."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Подпис на помощната програма за надграждане"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Помощна програма за надграждане"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Грешка при доставянето"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Доставянето на надграждането бе неуспешно. Възможно е да има проблем с "
"мрежата. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Идентификацията е неуспешна"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -847,11 +847,11 @@
"Идентификацията на надграждането е неуспешна. Възможно е да има проблем с "
"мрежата или сървъра. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Грешка при извличането"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -859,11 +859,11 @@
"Извличането на надграждането бе неуспешно. Възможно е да има проблем с "
"мрежата или сървъра. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Проверката е неуспешна"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -871,12 +871,12 @@
"Проверката на надграждането се провали. Възможно е да има проблем с мрежата "
"или със сървъра. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Не може да се изпълни надграждане"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -884,7 +884,7 @@
"Това обикновено е причинено от система, където /tmp е монтиран noexec. Моля "
"ремонтирайте без noexec и стартирайте надграждането отново."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Съобщението с грешка е «%s»."
@@ -995,11 +995,11 @@
"\n"
"Искате ли да продължите?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Няма i686 процесор"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1011,11 +1011,11 @@
"минимална архитектура. Не е възможно да надградите система си до ново "
"издание на Убунту с този хардуер."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Няма ARMv6 процесор"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1026,11 +1026,11 @@
"пакети в Karmic бяха оптимизрани с изискване минимум ARMv6 архитектура. Не е "
"възможно да надградите система си до ново издание на Убунту с този хардуер."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Няма достъпен init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1044,11 +1044,11 @@
"изисква се, актуализиране на настройката на виртуалната ви машина.\n"
"Сигурни ли сте, че искате да продължите?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE е изключен"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1781,13 +1781,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Сваляне на инструмента за награждане на изданието"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Провери дали е възможно надграждането до последното нестабилно издание в "
"разработка"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1865,20 +1865,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "За да се надградите до него, изпълнете «do-release-upgrade»."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Актуализационен център"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Достъпно е надграждане на Убунту %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Вие сте отказали надграждането до Убунту %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Добави резултатите за отстраняване на грешки"
diff -Nru ubuntu-release-upgrader-17.04.7/po/bn.po ubuntu-release-upgrader-17.10.1/po/bn.po
--- ubuntu-release-upgrader-17.04.7/po/bn.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/bn.po 2017-04-24 21:05:20.000000000 +0000
@@ -19,14 +19,14 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: en\n"
"X-Language: bn_BD\n"
"X-Poedit-Language: Bengali\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s-এর জন্য সার্ভার"
@@ -34,20 +34,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "প্রধান সার্ভার"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "কাস্টম সার্ভারসমূহ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list ভুক্তি গননা করা সম্ভব নয়"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -55,11 +55,11 @@
"কোন প্যাকেজ ফাইল পাওয়া যায়নি, সম্ভবত এটি উবুন্টু ডিস্ক নয়, নাকি এটি ভুল "
"আর্কিটেকচারের?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "সিডি যোগ করা সম্ভব হয়নি"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -74,13 +74,13 @@
"ত্রুটির বার্তাটি হল:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "খারাপ অবস্থায় থাকা প্যাকেজ সরাও"
msgstr[1] "খারাপ অবস্থায় থাকা প্যাকেজগুলো সরাও"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +101,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "সার্ভারে সম্ভবত অত্যাধিক চাপ পড়েছে"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "ভাঙা প্যাকেজসমূহ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -119,7 +119,7 @@
"অগ্রসর হোন।"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,26 +130,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"এটি হয়তো একটি অস্থায়ী সমস্যা, অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "আপগ্রেডের পরিমাণ নির্ণয় করা যাচ্ছে না।"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "কিছু প্যাকেজের পরিচয় প্রমাণে ত্রুটি হয়েছে"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -159,7 +159,7 @@
"ত্রুটি। আপনি পরবর্তীতে আবার চেষ্টা করতে পারেন। পরিচয় অপ্রমাণিত প্যাকেজের "
"তালিকার জন্য নিচে দেখুন।"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -167,32 +167,32 @@
"'%s' প্যাকেজটিকে অপসারনের জন্য চিহ্নিত করা হয়েছে কিন্তু এটি অপসারনের জন্য "
"কাল তালিকা ভুক্ত।"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "গুরুত্বপূর্ণ প্যাকেজ '%s' মুছে ফেলার জন্য চিহ্নিত করা হয়েছে।"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "কালো তালিকাভুক্ত সংস্করন '%s' ইনস্টলের চেষ্টা করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ইন্সটল করা যাচ্ছে না"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-package অনুমান করা যাচ্ছ না"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -504,7 +504,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "পরিবর্তন হিসাব করা হচ্ছে"
@@ -526,7 +526,7 @@
"কোনো সময়ে আপগ্রেড বন্ধ করে দিতে পারেন।"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "আপগ্রেড ডাউনলোড করা যায় নি"
@@ -541,28 +541,28 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "প্রেরণ করার সময় সমস্যা"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "সিস্টেমটি রিস্টার্ট করছি"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "আপগ্রেড ইন্সটল করা যায় নি"
# snigdha
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -570,7 +570,7 @@
"আপগ্রেড বন্ধ করে দেয়া হয়েছে। সিস্টেমটি এখন ব্যবহার করা নাও যেতে পারে। এখন "
"পুনরূদ্ধারকরণ প্রক্রিয়া চলতে থাকবে (dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -581,7 +581,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -589,21 +589,21 @@
"আপগ্রেড প্রত্যাখ্যান করা হয়েছে। অনুগ্রহ করে ইন্টারনেট সংযোগ বা ইনস্টলেশন "
"মিডিয়া পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন। "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "রাখো (_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "সরাও (_স)"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -614,29 +614,29 @@
# snigdha
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "প্রয়োজনীয় ডিপেন্ডেন্সী ইন্সটল করা হয়নি"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "প্রয়োজনীয় ডিপেন্ডেন্সী '%s' ইন্সটল করা হয়নি। "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "আপগ্রেডের প্রস্তুতি ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -644,19 +644,19 @@
"সিস্টেমকে হালনাগাদের জন্য প্রস্তুতকরণ ব্যর্থ হয়েছে, তাই একটি ত্রুটি রিপোর্ট "
"করার প্রক্রিয়া শুরু হয়েছে"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
# prb-snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "আপগ্রেডের জন্য প্রয়োজনীয় তথ্য পেতে ব্যার্থ"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -668,7 +668,7 @@
"\n"
"উপরন্তু, বাগ প্রতিবেদন করার প্রক্রিয়া শুরু করা হচ্ছে।"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -677,23 +677,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "সিডি রোম যোগ করতে ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "দুঃখিত, সিডি রোম সফল হয়নি।"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ভুল প্যাকেজ তথ্য"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -705,41 +705,41 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "টেনে আনা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "আপগ্রেড করা হচ্ছে"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "হালনাগাদ সম্পন্ন হয়েছে"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "আপগ্রেড সম্পন্ন কিন্তু আপগ্রেড প্রসেসের সময় ত্রুটি ঘটে।"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "সিস্টেম আপগ্রেড সম্পন্ন।"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "আংশিক আপগ্রেড সম্পন্ন হয়েছে।"
@@ -768,44 +768,44 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "প্রমাণীকরণ '%(file)s' বিনিময়ে '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' নিষ্কর্ষ করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "আপগ্রেড টুলটি চালানো যায় নি"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "আপগ্রেড টুল স্বাক্ষর"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "আপগ্রেড টুল"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "আনতে ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "আপগ্রেডটি আনতে ব্যর্থ। নেটওয়ার্কে কোন সমস্যা থাকতে পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "অনমোদন প্রক্রিয়া ব্যর্থ"
# snigdha
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -813,11 +813,11 @@
"আপগ্রেড পরীক্ষা করা ব্যর্থ হয়েছে। নেটওয়ার্ক বা সার্ভারে কোনো সমস্যা হতে "
"পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "এক্সট্রাক্ট করতে ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -825,12 +825,12 @@
"আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে "
"পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "যাচাই ব্যর্থ"
# snigdha
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -838,12 +838,12 @@
"আপগ্রেড পরীক্ষা করা ব্যর্থ হয়েছে। নেটওয়ার্ক বা সার্ভারে কোনো সমস্যা থাকতে "
"পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "আপগ্রেড চালানো যায় নি"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -851,7 +851,7 @@
"এটি সাধারণত সিস্টেম দিয়ে সংঘটিত হয়েছে যেখানে /tmp mounted noexec। অনুগ্রহ "
"করে noexec ছাড়া পুনরায় মাউন্ট করুন এবং উন্নীত করণ আবার চালান।"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "ত্রুটি বার্তাটি হল '%s'।"
@@ -960,11 +960,11 @@
"\n"
" আপনি কি চালিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "কোনো i686 CPU নেই"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -976,11 +976,11 @@
"হার্ডওয়্যার সহকারে আপনার সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব "
"নয়।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "কোনো ARMv6 CPU নেই"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -992,11 +992,11 @@
"হার্ডওয়্যার সহকারে আপনার সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব "
"নয়।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "কোনো init নেই"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1011,11 +1011,11 @@
"\n"
"আপনি কি নিশ্চিত আপনি এগিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1765,12 +1765,12 @@
msgstr "রিলিজ আপগ্রেড টুল ডাউনলোড করা হচ্ছে"
# snigdha
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "সর্বশেষ ডেভেল রিলিজ আপগ্রেড করা সম্ভব কিনা তা পরীক্ষা করে দেখুন"
# snigdha
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1848,20 +1848,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "আপগ্রেড করতে 'do-release-upgrade' চালান।"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "উবুন্টু %(version)s আপগ্রেড বিদ্যমান"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "আপনি উবুন্টু %s তে আপগ্রেড করতে চেয়েছেন"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "ডিবাগ আউটপুট সংযুক্ত করুন"
diff -Nru ubuntu-release-upgrader-17.04.7/po/bo.po ubuntu-release-upgrader-17.10.1/po/bo.po
--- ubuntu-release-upgrader-17.04.7/po/bo.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/bo.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: bo\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s ཡི་ཞབས་ཞུ་བ"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ཞབས་ཞུ་བ་གཙོ་བོ"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "རང་བཟོས་ཞབས་ཞུ་བ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "གཏེར་མཛོད་གྲངས་ཐོ་བརྩི་མི་ཐུབ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"འདི་ཕལ་ཆེར་མ་ལག་Ubuntu་མཛོད་སྡེར་རེད་མི་འདུག་ཡང་ན་སྒྲིག་བཟོ་ "
"ཡང་དག་པ་རེད་མི་འདུག"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "་་CD་་འོད་སྡེར་ནང་ཚན་ཁ་སྣོན་ཐུབ་མ་བྱུང་།"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,12 +70,12 @@
"ནོར་འཁྲུལ་ཡི་གེ་ནི། \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "སྐྱོན་ཅན་གྱི་ཐུམ་བུ་བསུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -92,15 +92,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "ཕལ་ཆེར་དྲ་ཞབས་ཞུ་བ་འདིར་ཁུར་པོ་ལྗིད་དྲག་འདུག"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "སྐྱོན་ཤོར་བའི་ཐུམ་བུ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -110,7 +110,7 @@
"get་བེད་སྤྱོད་གཏོང་ནས་བཟོ་བཅོས་བྱེད་རོགས"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -121,25 +121,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "This is most likely a transient problem. Please try again later."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "རིམ་སྤོར་རྩིས་འདངས་རྒྱག་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "ཐུམ་བུ་འགའ་ངོས་འཛིན་བྱེད་པ་ནོར་འཁྲུལ་"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -149,7 +149,7 @@
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -157,32 +157,32 @@
"རྟགས་'%s'འདི་འཁོད་ཡོད་པ་ཚང་མ་བསུབ་དགོས་ཀྱང་འདི་བསུབ་རྒྱུའི་དེབ་ཐོ་ནང་དུ་མི་འད"
"ུག"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "གལ་ཆེན་ཐུམ་བུ'%s' འདིར་བསུབ་དགོས་པའི་རྟགས་འཁོད་འདུག"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "རྟགས་ངན་ཅན་པར་གཞི་'%s་སྒྲིག་འཇུག་ཚོད་ལྟ་བཞིན་པ'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'སྒྲིག་འཇུག་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-package་ཚོད་དཔགས་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -476,7 +476,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "བཟོ་བཅོས་འདི་བརྩི་འདངས་རྒྱག་བཞིན་པ"
@@ -498,7 +498,7 @@
"ཁྱོད་ཀྱིས་རྗེས་སུ་རིམ་སྤོར་དེ་མི་མཐུད་ཐུབ"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "རིམ་སྤོར་ལེན་འཇུག་མི་ཐུབ་པ"
@@ -510,27 +510,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "ངོས་འཛིན་སྐབས་སྐྱོན་བྱུང་བ"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "མ་ལག་ཐོག་མའི་གནས་སྟངས་བསྐྱར་གསོ་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "རིམ་སྤོར་སྒྲིག་འཇུག་མི་ཐུབ་པ"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -538,7 +538,7 @@
"རིམ་སྤོར་ཆད་སོང་། ཁྱོད་ཀྱི་མ་ལག་དེ་སྤྱོད་མི་རུང་བའི་གནས་ལ་ལྷུང་འགྲོ་ཉེན་ཆེ། "
"ད་ལྟ་སྐྱོན་གསོ་བྱེད་ཞིག་འཁོར་སྐྱོད་བྱེད་པ (dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -549,7 +549,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -558,20 +558,20 @@
"ཁྱོད་ཀྱི་དྲ་བ་སྦྲེལ་མཐུད་དང་ཡང་ན་སྒྲིག་འཇུག་འཇུག་ཟམ་ལ་ཞིབ་བཤེར་བྱས་ནས་ཡང་བསྐྱ"
"ར་ཚོད་ལྟ་བྱེད་རོགས "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "དུས་ཡོལ་འཐུམ་སྒྲིལ་བསུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "ཉར་འཇོག_K"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "བསུབ་པ_R"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -580,45 +580,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "དགོས་མཁོའི་ཞོལ་གཏོགས་སྒྲིག་འཇུག་བྱས་མི་འདུག"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "དགོས་མཁོའི་ཞོལ་གཏོགས་'%s' སྒྲིག་འཇུག་མི་འདུག "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "འཐུམ་སྒྲིལ་དོ་དམ་པ་ཞིབ་བཤེར་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "ལེགས་འགྲུབ་མ་ཐུབ་པའི་རིམ་སྤོར་ལ་གྲ་སྒྲིག་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "སྔོན་འགྲོའི་ཆ་རྐྱེན་ཐོབ་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -626,7 +626,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -635,23 +635,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "གསོག་མཛོད་གྱི་གནས་ཚུལ་གསར་སྒྱུར་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "་་CD་་འོད་སྡེར་བཀོལ་ཆས་ཁ་སྣོན་མ་ཐུབ"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "དགོངས་དག འོད་སྡེར་འཇུག་གནས་སྣོན་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "འཐུམ་སྒྲིལ་གནས་ཚུལ་ཕན་ནུས་མེད་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -663,41 +663,41 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "ལེན་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "རིམ་སྤོར་བཞིན་པ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "རིམ་སྤོར་ལེགས་འགྲུབ"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"རིམ་སྤོར་ལེགས་འགྲུབ་ཚར་ནའང་རིམ་སྤོར་སྐྱོད་བཞིན་པའི་སྐབས་ནོར་འཁྲུལ་ཞིག་འདུག"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "དུས་ཡོལ་གྱི་མཉེན་ཆས་འཚོལ་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "མ་ལག་རིམ་སྤོར་ལེགས་འགྲུབ་ཚར"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "ཆ་ཤས་རིམ་སྤོར་ཞིག་ལེགས་འགྲུབ་ཚར"
@@ -726,54 +726,54 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "རིམ་སྤོར་སྤྱོད་ཆས་འཁོར་སྐྱོད་བྱེད་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "རིམ་སྤོར་སྤྱོད་ཆས་གྱི་ས་ཡིག"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "རིམ་སྤོར་སྤྱོད་ཆས"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "ལེན་འཇུག་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "རིམ་སྤོར་ལེན་འཇུག་མ་ཐུབ་པ། འདི་ནི་དྲ་བའི་གནོད་སྐྱོན་ཞིག་ཕལ་ཆེར་རེད "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "བདེན་དཔངས་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"རིམ་སྤོར་བདེན་དཔངས་མ་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "ཕྱིར་རུ་འདོན་མི་ཐུབ་"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -781,29 +781,29 @@
"རིམ་སྤོར་ཕྱིར་རུ་འདོན་མི་ཐུབ་པ། "
"འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "ར་སྤྲོད་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"རིམ་སྤོར་ར་སྤྲོད་མ་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "རིམ་སྤོར་འཁོར་སྐྱོད་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "ནོར་འཁྲུལ་བརྡ་འཕྲིན་ '%s'"
@@ -904,11 +904,11 @@
"\n"
"ཁྱོད་ཀྱིས་མུ་མཐུད་དགོས་སམ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 CPU་མེད་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -920,11 +920,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 CPU་མེད་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -936,11 +936,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init ་མེད་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -956,11 +956,11 @@
"\n"
"Are you sure you want to continue?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1677,13 +1677,13 @@
msgid "Downloading the release upgrade tool"
msgstr "རིམ་སྤོར་འགྲེམས་སྤེལ་སྤྱོད་ཆས་ལེན་འཇུག་བཞིན་པ"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Check if upgrading to the latest devel release is "
"possibleཐེངས་རྗེས་མའི་འགྲེམ་སྤེལ་ལ་རིམ་སྤོར་ཐུབ་མིན་རྟགས་བཤེར"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1764,20 +1764,22 @@
"'do-release-"
"upgrade'འགྲེལ་སྤེལ་རིམ་སྤོར་བྱོས་་འཁོར་སྤྱོད་བྱས་ནས་དེ་ལ་རིམ་སྤོར་བྱེད་པ"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(པར་གཞི་)་ལ་རིམ་སྤོར་ཆོག་པ"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ubuntu %s་རིམ་སྤོར་བྱེད་པར་ཁྱོད་ཀྱིས་འདོར་ཚར"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/br.po ubuntu-release-upgrader-17.10.1/po/br.po
--- ubuntu-release-upgrader-17.04.7/po/br.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/br.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: br\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Dafariad evit %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Penndafariad"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Dafariadoù personelaet"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "N'eus ket tu da jediñ enankad sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"N'eo ket gouest da zelec'hiañ tamm restr pakad ebet, marteze n'eo ket ur "
"gantenn Ubuntu pe an adeiladezh fall ?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "C'hwitadenn war ouzhpennañ ar CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Kemennadenn ar fazi a oa :\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Dilemel ar pakad en ur stad fall"
msgstr[1] "Dilemel ar pakadoù en ur stad fall"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Marteze ez eo an dafariad dreistkarget"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pakadoù torr"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"an argerzh."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -124,25 +124,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Stumm ur gudenn badennek zo warni, klaskit diwezhatoc'h, mar plij."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "N'eo ket gouest da jediñ an hizivadenn"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fazi gant dilesa pakadoù zo"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -152,7 +152,7 @@
"Marteze ho po c'hoant da glask diwezhatoc'h. Taolit ur sell amañ dindan war "
"ur rollad pakadoù andilesaet."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -160,32 +160,32 @@
"Merket eo ar pakad '%s' da vezañ dilamet, war roll du an dilemel emañ "
"koulskoude."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Merket eo ar pakad pennañ '%s' da vezañ dilamet."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Klask da staliañ an handelv '%s' a zo war ar roll du"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "N'hall ket staliañ '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "N'hall ket dinoiñ ar metapakad"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -480,7 +480,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "O jediñ ar c'hemmoù"
@@ -500,7 +500,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "N'haller ket pellgargañ an hizivadennoù"
@@ -513,33 +513,33 @@
# drebadek : permanent
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Fazi e-pad ma oa o lakaat da zrebadek"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Oc'h adsevel stad orin ar reizhiad"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "N'haller ket staliañ an hizivadennoù"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -550,26 +550,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Dilemel ar pakadoù dispredet ?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Mirout"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Dilemel"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -579,45 +579,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "N'eo ket bet staliet diazalc'hadennoù azgoulennet"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "N'eo ket bet staliet an diazalc'hadenn '%s' azgoulennet. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "O wiriañ ardoer ar pakadoù"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "C'hwitadenn war prientiñ an hizivaat"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "C'hwitadenn war kaout ar meziantoù rakgoulennet ret d'an hizivaat"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -625,7 +625,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -634,23 +634,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "O hizivaat stlennoù ar mirlec'h"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Stlennoù ar pakadoù didalvoudek"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -662,40 +662,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "O tastum"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "O hizivaat"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Echu eo an hizivaat"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "O klask meziantoù dispredet"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Echu eo hizivadur ar rezizhiad"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Peurechu eo an hizivaat darnel"
@@ -724,45 +724,45 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "N'hall ket erounit ar benveg da hizivaat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Sinadur ar benveg da hizivaat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Benveg da hizivaat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "C'hwitadenn war an dastum"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"C'hwitadenn war dastum an hizivadenn. Marteze ez eus ur gudenn gant ar "
"rouedad. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "C'hwitadet eo an dilesa"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -770,11 +770,11 @@
"C'hwitadenn war dilesa an hizivadenn. Marteze ez eo en abeg d'ur gudenn gant "
"ar rouedad pe gant an dafariad. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "C'hwitet eo an eztennañ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -782,11 +782,11 @@
"C'hwitadenn war an eztennañ. Marteze ez eo en abeg d'ur gudenn gant ar "
"rouedad pe gant an dafariad. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "C'hwitet eo ar gwiriañ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -794,18 +794,18 @@
"C'hwitadenn war gwiriañ an hizivadennoù. Marteze ez eo en abeg d'ur gudenn "
"gant ar rouedad pe gant an dafariad. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "N'hall ket seveniñ an hizivaat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Ar gemennadenn fazi zo '%s'."
@@ -906,11 +906,11 @@
"\n"
"Ha fellout a ra deoc'h kenderc'hel ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -918,11 +918,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Korrgewerier ARMv6 ebet"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -934,12 +934,12 @@
"c'houlenne da gaout ARMv6 evit adeiladezh izek. N'eus ket tro da hizivaat ho "
"reizhiad da handelv nevez Ubuntu gant ar periant-mañ."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "an deraouekaat n'eo ket hegerz"
# daemon : argerzh en drekva
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -954,11 +954,11 @@
"gefluniañ galloudel da gentañ.\n"
"Ha fellout a ra deoc'h kenderc'hel ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1673,11 +1673,11 @@
msgid "Downloading the release upgrade tool"
msgstr "O pellgargañ an ostilh da hizivaat an handelvoù"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Gwiriañ hag-eñ ez eus tro da hizivaat d'an handelv diorren"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1752,20 +1752,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Erounit 'do-release-upgrade' a-benn hizivaat."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Hizivadenn Ubuntu %(version)s hegerz"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Nac'hac'het hoc'h eus hizivaat da Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/bs.po ubuntu-release-upgrader-17.10.1/po/bs.po
--- ubuntu-release-upgrader-17.04.7/po/bs.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/bs.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: bs\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server za zemlju %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Glavni server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Podešeni serveri"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nemoguće izračunati sources.list unos"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Nemoguće pronaći pakete, možda ovo nije Ubuntu Instalacijski Disk ili "
"pogrešna Unix arhitektura?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Nemoguće dodati CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Poruka je bila:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Ukloni paket u lošem stanju"
msgstr[1] "Ukloni pakete u lošem stanju"
msgstr[2] "Ukloni pakete u lošem stanju"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +101,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server je možda preopterećen"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Neispravni paketi"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -118,7 +118,7 @@
"programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -136,12 +136,12 @@
" * neoficijelnim software paketima koji nisu ustupljeni od strane Ubuntu-a\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Ovo je najverovatnije prolazni problem, molimo pokušajte ponovo kasnije."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -149,15 +149,15 @@
"Ako ništa od ovog nije slučaj, u terminalu otkucajte komandu 'ubuntu-bug "
"ubuntu-release-upgrader-core' da prijavite grešku."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nemoguće izračunati nadogradnju"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Greška kod autentikacije nekih paketa"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -167,29 +167,29 @@
"problem s mrežom i trebali biste pokušati ponovo kasnije. Pogledajte spisak "
"neidentificiranih paketa."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Paket '%s' je označen za uklanjanje azli se nalazi na crnoj listi uklanjanja."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Neophodni paket '%s' je označen za uklanjanje."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Покушавам да инсталирам верзију '%s' из црне листе"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nemoguće instalirati '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -197,11 +197,11 @@
"Nemoguće instalirati potrebne pakete. Instalirajte 'ubuntu-bug ubuntu-"
"release-upgrader-core' u terminalu."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nisam mogao odrediti meta-paket"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -529,7 +529,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Izračunavanje promjena"
@@ -551,7 +551,7 @@
"Možete da nastavite nadogradnju kasnije."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nisam mogao preuzeti nadogradnje"
@@ -565,27 +565,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Javila se greška tokom upisivanja"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Vraćam u početno stanje"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nisam mogao instalirati nadogradnje"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -593,7 +593,7 @@
"Nadogradnja je prekinuta. Vaš sistem bi mogao biti u neupotrebljivom stanju. "
"Popravak će upravo biti pokrenut (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -610,27 +610,27 @@
"prijavu greške.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
"Nadogradnja je prekinuta. Vaš sistem bi mogao biti u neupotrebljivom stanju. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ukloniti zastarjele pakete?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Zadrži"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Ukloni"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -640,28 +640,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Neophodna međuzavisnost nije instlirana."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Neophodna međuzavisnost „%s“ nije instlirana. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Provjeravam menadžera paketa"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Neuspjelo pripremanje nadogradnje"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -669,7 +669,7 @@
"Priprema sistema za nadogradnju nije uspjela tako da je pokrenut proces za "
"izvještavanje o greški."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -677,12 +677,12 @@
"Priprema sistema za nadogradnju je neuspjela. Da prijavite grešku "
"instalirajte apport u pokrenite 'apport-bug ubuntu-release-upgrader'"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Neuspjelo dobavljanje preduslova za nadogradnju"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -694,7 +694,7 @@
"\n"
"Uz ovo, pokrenut je i proces za izvještavanje o grešci."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -708,23 +708,23 @@
"Da prijavite grešku instalirajte apport u pokrenite 'apport-bug ubuntu-"
"release-upgrader'"
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Nadograđujem podatke repozitorija"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Neuspjelo dodavanje CD ROM-a"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Nažalost, dodavanje CD-roma nije uspjelo."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Neispravni podaci paketa"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -743,41 +743,41 @@
"U slučaju preopterećenog mirror servera pokušajte nadogradnju uraditi "
"kasnije."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Dobavljanje"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Nadograđujem"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Nadogradnja završena"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Nadogradnja je završila, ali su bile greške tokom postupka nadogradnje."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Tražim zastarjele programe"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Nadogradnja sistema je završena."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Djelimična nadogradnja završena."
@@ -806,17 +806,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "potvrdi identitet „%(file)s“ za potpis „%(signature)s“ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "izvlačim „%s“"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nisam mogao pokrenuti alat za nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -824,28 +824,28 @@
"Ovo je greška u alatu za nadogradnju. Prijavite je na 'ubuntu-bug ubuntu-"
"release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Potpis alata za nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Alat za nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Preuzimanje nije uspjelo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Preuzimanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Provjera identiteta nije uspjela."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -853,11 +853,11 @@
"Autorizacija nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s "
"serverom. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Raspakivanje nije uspelo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -865,11 +865,11 @@
"Ne mogu da raspakujem nadogradnju. Možda postoji problem sa mrežom ili "
"serverom. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Provjera vjerodostojnosti nije uspjela"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -877,12 +877,12 @@
"Provjera nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s "
"serverom. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nemoguće izvršiti nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -890,7 +890,7 @@
"Ovo je vjerovatno izazvano sistemom gdje je /tmp montiran sa noexec-om. "
"Molim remontirajte bez noexec-a i izvršite ažuriranje ponovo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Poruka greške je '%s'."
@@ -1001,11 +1001,11 @@
"\n"
"Da li želite da nastavite?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nema i686 procesora"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1017,11 +1017,11 @@
"arhitekturu. Nije moguće nadograditi sistem na novo Ubuntu izdanje s ovim "
"hardverom."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nema ARMv6 procesora"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1033,11 +1033,11 @@
"minimalnu arhitekturu. Nije moguće nadograditi vaš sistem na novo Ubuntu "
"izdanje sa ovim hardverom."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init nije dostupan"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1052,11 +1052,11 @@
"\n"
"Da li ste sigurni da želite na nastavite?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nije uključen"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1792,11 +1792,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Preuzimanje alatke izdanja nadogradnje"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Provjeri da li je moguće nadograditi na najnovije razvojno izdanje"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1876,20 +1876,22 @@
msgstr ""
"Pokrenite komandu „do-release-upgrade“ da biste prešli na to izdanje."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Nadogradnja softvera"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Dostupna je Ubuntu %(version)s nadogradnja"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Odbili ste nadogradnju na Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Dodaj izlaz za uklanjanje grešaka"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ca.po ubuntu-release-upgrader-17.10.1/po/ca.po
--- ubuntu-release-upgrader-17.04.7/po/ca.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ca.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ca\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor per %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidors personalitzats"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "No s'ha pogut calcular l'entrada del fitxer sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"No s'ha pogut trobar cap paquet, esteu utilitzat un disc de l'Ubuntu per a "
"l'arquitectura adequada?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "No s'ha pogut afegir el CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"El missatge d'error ha estat:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Elimina el paquet en mal estat"
msgstr[1] "Elimina els paquets en mal estat"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Pot ser que el servidor estigui sobrecarregat"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquets trencats"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"aquesta aplicació. Utilitzeu el Synaptic o l'apt-get abans de continuar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -132,12 +132,12 @@
"l'Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Això és probablement un problema transitori, torneu a provar-ho més tard."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -145,15 +145,15 @@
"Si res d'això és aplicable, informeu d'aquest error utilitzant l'ordre "
"«ubuntu-bug ubuntu-release-upgrader-core» en un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "No s'ha pogut calcular l'actualització"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "S'ha produït un error en autenticar alguns paquets"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -163,7 +163,7 @@
"amb la xarxa. Podeu provar-ho més tard. A continuació es mostra la llista "
"amb els paquets no autenticats."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -171,22 +171,22 @@
"El paquet «%s» està marcat per a eliminar-lo, però apareix a la llista negra "
"de fitxers a eliminar."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "El paquet essencial «%s» està marcat per a ésser eliminat."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "S'està intentant instal·lar la versió «%s» de la llista negra"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "No s'ha pogut instal·lar «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -194,11 +194,11 @@
"Ha sigut impossible instal·lar el paquet necessari. Informeu d'aquest error "
"utilitzant l'ordre «ubuntu-bug ubuntu-release-upgrader-core» en un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "No s'ha pogut conjecturar el metapaquet"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -259,9 +259,9 @@
"If you continue, an additional ssh daemon will be started at port '%s'.\n"
"Do you want to continue?"
msgstr ""
-"Sembla ser que aquesta sessió s'està executant amb SSH. Actualment no és "
-"recomanable realitzar una actualització a través d'SSH, atès que en cas de "
-"fallada la recuperació és més difícil.\n"
+"Segons sembla, aquesta sessió s'està executant per sota d'SSH. Actualment no "
+"és recomanable realitzar una actualització per sota d'SSH, atès que en cas "
+"de fallada la recuperació és més difícil.\n"
"\n"
"Si continueu, s'iniciarà un dimoni addicional al port «%s».\n"
"Voleu continuar?"
@@ -369,11 +369,11 @@
"If you answer 'no' here, the network is not used at all."
msgstr ""
"El sistema d'actualitzacions pot utilitzar Internet per baixar i instal·lar "
-"automàticament les darreres actualitzacions. Si disposeu d'una connexió de "
+"automàticament les últimes actualitzacions. Si disposeu d'una connexió de "
"xarxa, aquesta opció és molt recomanable.\n"
"\n"
"L'actualització trigarà més, però en acabar tindreu un sistema completament "
-"actualitzat. Podeu optar per no fer-ho, però en breu haureu d'actualitzar el "
+"actualitzat. Podeu optar per no fer-ho, però aviat haureu d'actualitzar el "
"sistema.\n"
"Si responeu «no» la xarxa no s'utilitzarà per a res."
@@ -501,8 +501,8 @@
"problem, please check your network connection and retry."
msgstr ""
"S'ha produït un error mentre s'actualitzava el vostre sistema. Normalment "
-"això es degut a problemes de xarxa. Comproveu la vostra connexió de xarxa i "
-"torneu a intentar-ho."
+"això és a causa de problemes de xarxa. Comproveu la vostra connexió de xarxa "
+"i torneu a intentar-ho."
#: ../DistUpgrade/DistUpgradeController.py:986
msgid "Not enough free disk space"
@@ -524,7 +524,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "S'estan calculant els canvis"
@@ -546,7 +546,7 @@
"sistema. Podeu continuar l'actualització més tard."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "No s'han pogut baixar les actualitzacions"
@@ -561,27 +561,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "S'ha produït un error durant l'enviament"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "S'està restaurant l'estat original del sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "No s'han pogut instal·lar les actualitzacions"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -590,7 +590,7 @@
"en un estat inestable. Ara s'executarà un procés de recuperació (dpkg --"
"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -607,7 +607,7 @@
"adjunteu els fitxers de /var/log/dist-upgrade/ a l'informe d'error.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -615,20 +615,20 @@
"S'ha interromput l'actualització. Verifiqueu la vostra connexió a Internet o "
"el suport d'instal·lació i torneu-ho a intentar. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Voleu suprimir els paquets obsolets?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Manté"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Sup_rimeix"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -638,28 +638,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Les dependències requerides no estan instal·lades"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dependència requerida «%s» no està instal·lada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "S'està comprovant el gestor de paquets"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "S'ha produït un error en la preparació de l'actualització"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -667,20 +667,20 @@
"Ha fallat la preparació del sistema per l'actualització, per la qual cosa "
"s'iniciarà el procés d'informe d'errors."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
"Ha fallat la preparació de l'actualització del sistema. Per informar d'un "
-"error, instal·leu l'apport i executeu «apport-bug ubuntu-release-upgrader»"
+"error, instal·leu l'apport i executeu «apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "S'ha produït un error en obtenir els prerequisits de l'actualització"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -693,7 +693,7 @@
"\n"
"També s'iniciarà el procés d'informe d'errors."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -708,23 +708,23 @@
"Per informar d'un error instal·leu apport i executeu 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "S'està actualitzant la informació dels dipòsits"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "No s'ha pogut afegir el CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "No s'ha pogut afegir el CD-ROM correctament."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
-msgstr "La informació dels paquets no és valida"
+msgstr "La informació del paquet no és vàlida"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -736,48 +736,48 @@
"later."
msgstr ""
"Després d'actualitzar la informació dels paquets, no s'ha pogut localitzar "
-"el paquet essencial «%s». Això es deu a que no teniu cap rèplica oficial al "
-"llistat de fonts de programari o perquè hi ha una càrrega excessiva en la "
+"el paquet essencial «%s». Això deu al fet que no teniu cap rèplica oficial "
+"al llistat de fonts de programari o perquè hi ha una càrrega excessiva en la "
"rèplica que esteu utilitzant. Vegeu /etc/apt/sources.list per veure la "
"llista actual de fonts de programari.\n"
-"En cas de rèplica amb sobrecàrrega, podeu intentar actualitzar més tard."
+"En cas de rèplica amb sobrecàrrega, podeu intentar l'actualització més tard."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "S'està recollint"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "S'està actualitzant"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "S'ha completat l'actualització"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"S'ha completat l'actualització, però s'han produït errors durant aquest "
"procés."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "S'està cercant programari obsolet"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "S'ha completat l'actualització del sistema."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "L'actualització parcial s'ha completat."
@@ -799,24 +799,24 @@
#: ../DistUpgrade/DistUpgradeFetcher.py:128
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
msgid "Please check your internet connection."
-msgstr "Comproveu la vostra connexió a Internet"
+msgstr "Comproveu la vostra connexió a Internet."
#: ../DistUpgrade/DistUpgradeFetcherCore.py:73
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autenticació del fitxer «%(file)s» amb la signatura «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "s'està extraient «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "No es pot executar l'eina d'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -825,29 +825,29 @@
"d'aquest error utilitzant l'ordre «ubuntu-bug ubuntu-release-upgrader-core» "
"en un terminal."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signatura de l'eina d'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Eina d'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Ha fallat la baixada"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Ha fallat l'obtenció de l'actualització. Pot ser que hi hagi algun problema "
"a la xarxa. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Ha fallat l'autenticació"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -855,11 +855,11 @@
"Ha fallat l'autenticació de l'actualització. Pot ser que hi hagi algun "
"problema a la xarxa o al servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Ha fallat l'extracció"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -867,11 +867,11 @@
"Ha fallat l'extracció de l'actualització. Pot ser que hi hagi algun problema "
"a la xarxa o al servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Ha fallat la verificació"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -879,12 +879,12 @@
"Ha fallat la verificació de l'actualització. Pot ser que hi hagi algun "
"problema a la xarxa o al servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "No es pot executar l'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -893,7 +893,7 @@
"executable. Torneu-lo a muntar sense l'opció de no executable i torneu a "
"executar l'actualització."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "El missatge d'error és «%s»."
@@ -1008,11 +1008,11 @@
"\n"
"Voleu continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Sense CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1024,11 +1024,11 @@
"un i686 com a arquitectura mínima. No és possible actualitzar el sistema a "
"una versió nova de l'Ubuntu amb aquest maquinari."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No és una CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1040,11 +1040,11 @@
"requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el "
"vostre sistema a una versió nova de l'Ubuntu amb aquest maquinari."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "No hi ha cap sistema d'inicialització disponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1053,18 +1053,18 @@
"\n"
"Are you sure you want to continue?"
msgstr ""
-"Sembla ser que el vostre sistema és un entorn virtual sense un dimoni "
+"Segons sembla, el vostre sistema és un entorn virtual sense un dimoni "
"d'inicialització «init», com ara un servidor virtual de Linux (Linux-"
"VServer). L'Ubuntu 10.04 no pot funcionar en aquest tipus d'entorn - abans "
"cal fer una actualització de la configuració de la màquina virtual.\n"
"\n"
-"Segur que voleu continuar?"
+"Esteu segur que voleu continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "El PAE no està habilitat"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1072,7 +1072,7 @@
"http://help.ubuntu.com/community/EnablingPAE"
msgstr ""
"El sistema incorpora una CPU que no té el PAE habilitat. L'Ubuntu funciona "
-"amb sistemes sense PAE només fins la versió 12.04. Per actualitzar a una "
+"amb sistemes sense PAE només fins a la versió 12.04. Per actualitzar a una "
"versió posterior de l'Ubuntu, haureu d'habilitar el PAE (si és possible). "
"Consulteu la documentació següent per obtenir més informació:\n"
"http://help.ubuntu.com/community/EnablingPAE"
@@ -1424,8 +1424,8 @@
"This download will take about %s with a 1Mbit DSL connection and about %s "
"with a 56k modem."
msgstr ""
-"La baixada trigarà aproximadament %s amb una connexió ADSL d'1Mb, i "
-"aproximadament %s amb un mòdem de 56k"
+"La baixada trigarà aproximadament %s amb una connexió DSL d'1 Mbit, i "
+"aproximadament %s amb un mòdem de 56 k."
#. if we have a estimated speed, use it
#: ../DistUpgrade/DistUpgradeView.py:175
@@ -1483,8 +1483,8 @@
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
-msgstr[0] "S'instal·larà %d paquet nou"
-msgstr[1] "S'instal·laran %d paquets nous"
+msgstr[0] "S'instal·larà %d paquet nou."
+msgstr[1] "S'instal·laran %d paquets nous."
#: ../DistUpgrade/DistUpgradeView.py:392
#, python-format
@@ -1535,8 +1535,8 @@
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr ""
-"No hi ha actualitzacions disponibles per al vostre sistema. L'actualització "
-"es cancel·larà"
+"No hi ha actualitzacions disponibles per al vostre sistema. Ara es "
+"cancel·larà l'actualització."
#: ../DistUpgrade/DistUpgradeView.py:433
msgid "Reboot required"
@@ -1804,12 +1804,12 @@
msgid "Downloading the release upgrade tool"
msgstr "S'està baixant l'eina d'actualització a una versió nova"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Comprova si és possible actualitzar a la darrera versió de desenvolupament"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1882,26 +1882,28 @@
#: ../do-release-upgrade:153
#, c-format
msgid "New release '%s' available."
-msgstr "La versió nova «%s» ja està disponible"
+msgstr "La versió nova «%s» ja està disponible."
#: ../do-release-upgrade:154
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Executeu «do-release-upgrade» per actualitzar a la nova versió."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Gestor d'actualitzacions"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Hi ha disponible una actualització de l'Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Heu triat no actualitzar a l'Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Afegeix informació de depuració"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ca@valencia.po ubuntu-release-upgrader-17.10.1/po/ca@valencia.po
--- ubuntu-release-upgrader-17.04.7/po/ca@valencia.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ca@valencia.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ca\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor per %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidors personalitzats"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "No s'ha pogut calcular l'entrada del fitxer sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"No s'ha pogut trobar cap paquet, esteu utilitzat un disc de l'Ubuntu per a "
"l'arquitectura adequada?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "No s'ha pogut afegir el CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"El missatge d'error ha estat:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Elimina el paquet en mal estat"
msgstr[1] "Elimina els paquets en mal estat"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Pot ser que el servidor estiga sobrecarregat"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquets trencats"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"aplicació. Utilitzeu el Synaptic o l'apt-get abans de continuar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -132,26 +132,26 @@
"l'Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Això és probablement un problema transitori, torneu a provar-ho més tard."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "No s'ha pogut calcular l'actualització"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "S'ha produït un error en autenticar alguns paquets"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"amb la xarxa. Podeu provar-ho més tard. A continuació es mostra la llista "
"amb els paquets no autenticats."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,32 +169,32 @@
"El paquet «%s» està marcat per a eliminar-lo, però apareix a la llista negra "
"de fitxers a eliminar."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "El paquet essencial «%s» està marcat per a ésser eliminat."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "S'està intentant instal·lar la versió «%s» de la llista negra"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "No s'ha pogut instal·lar «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "No s'ha pogut conjecturar el metapaquet"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -501,7 +501,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "S'estan calculant els canvis"
@@ -523,7 +523,7 @@
"sistema. Podeu continuar l'actualització més tard."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "No s'han pogut baixar les actualitzacions"
@@ -538,27 +538,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "S'ha produït un error durant l'enviament"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "S'està restaurant l'estat original del sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "No s'han pogut instal·lar les actualitzacions"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -567,7 +567,7 @@
"en un estat inestable. Ara s'executarà un procés de recuperació (dpkg --"
"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -578,7 +578,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -586,20 +586,20 @@
"S'ha interromput l'actualització. Verifiqueu la vostra connexió a Internet o "
"el suport d'instal·lació i torneu-ho a intentar. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Voleu suprimir els paquets obsolets?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Manté"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Sup_rimeix"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -609,34 +609,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Les dependències requerides no estan instal·lades"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dependència requerida «%s» no està instal·lada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "S'està comprovant el gestor de paquets"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "S'ha produït un error en la preparació de l'actualització"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -644,13 +644,13 @@
"Ha fallat la preparació de l'actualització del sistema. Per informar d'un "
"error, instal·leu l'apport i executeu «apport-bug ubuntu-release-upgrader»"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
"S'ha produït un error en obtindre els prerequisits de l'actualització"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -658,7 +658,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -667,23 +667,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "S'està actualitzant la informació dels dipòsits"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "No s'ha pogut afegir el CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "No s'ha pogut afegir el CD-ROM correctament."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "La informació dels paquets no és valida"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -701,41 +701,41 @@
"per veure la llista actual de fonts de programari.\n"
"En cas de rèplica amb sobrecàrrega, podeu intentar actualitzar més tard."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "S'està recollint"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "S'està actualitzant"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "S'ha completat l'actualització"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"S'ha completat l'actualització, però s'han produït errors durant este procés."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "S'està cercant programari obsolet"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "S'ha completat l'actualització del sistema."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "L'actualització parcial s'ha completat."
@@ -764,45 +764,45 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "No es pot executar l'eina d'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signatura de l'eina d'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Eina d'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Ha fallat la baixada"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Ha fallat l'obtenció de l'actualització. Pot ser que hi haja algun problema "
"a la xarxa. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Ha fallat l'autenticació"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -810,11 +810,11 @@
"Ha fallat l'autenticació de l'actualització. Pot ser que hi haja algun "
"problema a la xarxa o al servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Ha fallat l'extracció"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -822,11 +822,11 @@
"Ha fallat l'extracció de l'actualització. Pot ser que hi haja algun problema "
"a la xarxa o al servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Ha fallat la verificació"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -834,12 +834,12 @@
"Ha fallat la verificació de l'actualització. Pot ser que hi haja algun "
"problema a la xarxa o al servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "No es pot executar l'actualització"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -848,7 +848,7 @@
"executable. Torneu-lo a muntar sense l'opció de no executable i torneu a "
"executar l'actualització."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "El missatge d'error és «%s»."
@@ -950,11 +950,11 @@
"\n"
"Voleu continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Sense CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -966,11 +966,11 @@
"un i686 com a arquitectura mínima. No és possible actualitzar el sistema a "
"una versió nova de l'Ubuntu amb este maquinari."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No és una CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -982,11 +982,11 @@
"requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el "
"vostre sistema a una versió nova de l'Ubuntu amb este maquinari."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "No hi ha cap sistema d'inicialització disponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1002,11 +1002,11 @@
"\n"
"Segur que voleu continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "El PAE no està habilitat"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1739,12 +1739,12 @@
msgid "Downloading the release upgrade tool"
msgstr "S'està baixant l'eina d'actualització a una versió nova"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Comprova si és possible actualitzar a la darrera versió de desenvolupament"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1823,20 +1823,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Executeu «do-release-upgrade» per actualitzar a la nova versió."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Gestor d'actualitzacions"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Hi ha disponible una actualitzacio de l'Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Heu triat no actualitzar a l'Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ceb.po ubuntu-release-upgrader-17.10.1/po/ceb.po
--- ubuntu-release-upgrader-17.04.7/po/ceb.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ceb.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ceb\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ce.po ubuntu-release-upgrader-17.10.1/po/ce.po
--- ubuntu-release-upgrader-17.04.7/po/ce.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ce.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ce\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s-на сервер"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Коьрта сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Пайдаэцархойн сервераш"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list элементана хьесап ца дало"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Пакетийн файлаш ца карайо, хIара Ubuntu Disc ца хила я харц архитектура хила "
"тарлой?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD тIе ца тохало"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"ГIалатах хаам:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "ГIалаташ долу пакет дIаяккха"
msgstr[1] "ГIалаташ долу пакеташ дIаяха"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Сервер тIех юьзна хила тарло"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Галайойлла пакеташ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"болх бале, synaptic я apt-get программийн гIоьнца дIанисйие уьш."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,12 +130,12 @@
" * Ubuntu дистрибьютивера йоцуш официале йоцу программаш\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Иза цхьана ханна йолу проблема хила тарло, тIаьхуо юха кхочушдан хьажа и."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Лакхахь мел дийцинчух хIумма а гIо деш дацахь, терминала тIехь 'ubuntu-bug "
"ubuntu-release-upgrader-core' команда кхочушдай, гIалатах хаам бие."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Системин цIиндарна хьесап ца дало"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Цхьайолу пакеташна аутентификаци ярехь гIалат"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"хила тарло, тIаьхьуо юха а хьажа мегар ду и кхочушдан. Лахахь аутентификаци "
"янза йолу пакетийн цIераш ю."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,22 +169,22 @@
"'%s' пакет дIаяккха билгалйаьккхина ю, амма иза дIаяккха ца магийначарна "
"юкъахь ю."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "'%s' коьрта пакеи дIаяккха билгалйаьккхина ю."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Iаьржа цIерйозанна юкъаяхийтина йолу '%s' верси дIахIотто хьажар"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' дIа ца хIоттало"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -192,11 +192,11 @@
"Оьшуш йолу пакет дIа ца хIоттало. Оцу гIалатах хаам бие, терминала чохь "
"'ubuntu-bug ubuntu-release-upgrader-core' команда кхочушдай."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Оьшу мета-пакет ца карайо"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -473,7 +473,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -493,7 +493,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -505,33 +505,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -542,26 +542,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -569,45 +569,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -615,7 +615,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -624,23 +624,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -652,40 +652,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -714,80 +714,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -881,11 +881,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -893,11 +893,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -905,11 +905,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -919,11 +919,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1598,11 +1598,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1670,20 +1670,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ckb.po ubuntu-release-upgrader-17.10.1/po/ckb.po
--- ubuntu-release-upgrader-17.04.7/po/ckb.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ckb.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "ناتوانێت جێگیری بکات '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/crh.po ubuntu-release-upgrader-17.10.1/po/crh.po
--- ubuntu-release-upgrader-17.04.7/po/crh.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/crh.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s içün sunucı"
@@ -29,21 +29,21 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Ana Sunucı"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Şahsiyleştirilgen sunucılar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list kirişi esaplanamadı"
# tr
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -52,12 +52,12 @@
"değildir ya da yanlış bir mimaridir?"
# tr
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD eklemede hata"
# tr
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -71,13 +71,13 @@
"Hata iletisi:'%s'"
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Hatali durumdaki paket(ler)i kaldır"
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,16 +95,16 @@
# tr
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server'a fazla yüklenmiş olabilir"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Sınıq paketler"
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"etmeden önce lütfen bunları synaptic veya apt-get kullanarak düzeltin."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -125,28 +125,28 @@
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Bu geçici bir problem gibi gözüküyor, lütfen daha sonra tekrar deneyiniz."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Üst-qademeleme esaplanamadı"
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Bazı paketlerin doğrulamasında hata oluştu"
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -157,7 +157,7 @@
"bakınız."
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -166,35 +166,35 @@
"içinde."
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Temel '%s' paketi kaldırılma için işaretlenmiş."
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Kara listede olan '%s' sürümü yüklenmeye çalışılıyor"
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "\"%s\" yüklenemiyor"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Meta-paket tahmin edilemiyor"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -518,7 +518,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Deñişiklikler esaplana"
@@ -543,7 +543,7 @@
# tr
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Yükseltmeler indirilemedi"
@@ -556,29 +556,29 @@
# tr
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "İşlem sırasında hata oluştu"
# tr
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Özgün sistem durumuna geri dönülüyor"
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Yükseltmeler kurulamadı"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -586,7 +586,7 @@
"Üst-qademeleme abortlandı. Sistemiñiz qullanılalmaz bir durumda olabilir. "
"Şimdi bir qurtarma çaptırılacaq (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -597,7 +597,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -605,21 +605,21 @@
"Üst-qademeleme abortlandı. Lütfen İnternet bağlantıñıznı ya da qurulım "
"vasatıñıznı teşkeriñiz ve tekrar deñeñiz. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Eskirgen paketler çetleştirilsinmi?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Qoru"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Çetleştir"
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -630,12 +630,12 @@
# tr
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Gerekli bağımlılıklar kurulu değil"
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Gerekli bağımlılık '%s' kurulu değil. "
@@ -643,35 +643,35 @@
# tr
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Paket yöneticisi denetleniyor"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Üst-qademeleme azırlığı muvafaqiyetsiz edi"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Güncelleme önkoşullarının alınması başarısız"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -679,7 +679,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -689,26 +689,26 @@
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Depo bilgileri güncelleniyor"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Kompakt disk faqat-oqulır hazifa (cdrom) eklenamadı"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
"Afu etiñiz, kompakt disk faqat-oqulır hazifanıñ (cdrom) eklenmesi "
"muvafaqiyetli degil edi."
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Geçersiz paket bilgisi"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -720,27 +720,27 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Ketirile"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Üst-qademelene"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Üst-qademeleme tamam"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
@@ -748,17 +748,17 @@
"hatalar bar edi."
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Kullanılmayan yazılımlar aranıyor"
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistem yükseltmesi tamamlandı."
# tr
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Kısmi yükseltme tamamlandı."
@@ -791,50 +791,50 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Yükseltme aracı çalıştırılamadı."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Yükseltme aracı imzası"
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Yükseltme aracı"
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Getirme başarısız"
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Yükseltme indirilemedi. Ağda bir sorun olabilir. "
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Kimlik denetimi başarısız oldu"
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -843,43 +843,43 @@
"olabilir. "
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Çıkarılamadı"
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "Yükseltme açılamadı. Ağda ya da sunucunuda bir sorun olabilir. "
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Doğrulama başarısız oldu"
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "Yükseltme onaylanamadı. Ağda ya da sunucuda bir sorun olabilir. "
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Yükseltme çalıştırılamıyor"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
# tr
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Hata mesajı '%s'"
@@ -986,12 +986,12 @@
"Devam etmege isteysiñizmi?"
# tüklü
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 prosessorı yoq"
# tr
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1004,12 +1004,12 @@
"yañı bir Ubuntu çıqarılışına üst-qademelemek mümkün degildir."
# tr
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 İşlemci Yok"
# tr
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1022,11 +1022,11 @@
"yükseltmek mümkün değil."
# tr
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Başlatıcı mevcut değil"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1041,11 +1041,11 @@
"\n"
"Devam etmege istegeniñizden eminsiñizmi?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1817,12 +1817,12 @@
msgstr "Sürüm güncelleme aracı indiriliyor"
# tr
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "En son geliştirme sürümüne yükseltme olasılığını denetle"
# tr
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1907,22 +1907,24 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Yükseltmek için 'do-release-upgrade' çalıştırın."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
# tr
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s Yükseltmesi Mevcut"
# tr
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ubuntu %s sürümüne yükseltmeyi reddettiniz"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/csb.po ubuntu-release-upgrader-17.10.1/po/csb.po
--- ubuntu-release-upgrader-17.04.7/po/csb.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/csb.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: csb\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Serwera dlô kraju %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Przédnô serwera"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Jine serwerë"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Ni mòże òbrachòwac wpisënka w lopkù sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Ni mòże nalezc niżódnëch lopków z paczetama, mòże to nie je disk z Ubuntu "
"abò lëchô architektura?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Ni mòże dodac platë CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Zamkłosc felë to:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Rëmanié lëchegò paczétu"
msgstr[1] "Rëmanié lëchich paczétów"
msgstr[2] "Rëmanié lëchich paczétów"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +101,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Serwer mòże bëc przecãżony"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paczétë są zepsëté"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -118,7 +118,7 @@
"pòprawic je brëkùjąc menadżera paczetów Synaptic abò apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -129,25 +129,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "To są le chwilowé problemë. Proszã spróbòwac pòzdze."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nié mòże przerobic aktualizacëjów"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fela ùdowierzaniô niechtërnych paczétów"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -156,7 +156,7 @@
"Nie dało sã ùdowierzëc niejednych paczétów. Mòże to bëc czasowô fela sécë. "
"Mòże spróbòwac pòzdze znowa. Niżi nachôdô sã lësta nieùdowierzónych paczétów"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -164,32 +164,32 @@
"Paczét \"%s\" je wëbróny do rëmniãcô, je òn rówank na lësce paczétów, "
"chtërnych nie je nót rëmac."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Nóterny paczét \"%s\" je nacéchòwóny do rëmniãcô."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Próba instalacëji wersëji \"%s\", jakô je na czôrny lësce"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ni mòże winstalowac '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Ni mòże òpisac meta-paczétu"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -465,7 +465,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Przerôbianié zmianów"
@@ -485,7 +485,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nié mòże zladowac zaktualnieniów"
@@ -497,33 +497,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Fela òbczas zacwierdzaniô"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Doprowôdzanié nazôd òriginalnegò stónu systemë"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Instalacëjô aktualizacëji nie darzëła sã."
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -534,26 +534,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Rëmnąc stôre paczétë?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "Ù_trzëmôj"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Rëmôj"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -561,45 +561,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Wëmôgónô zanóleżnota nie je winstalowónô."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Wëmôgónô zanóleżnota '%s' nie je winstalowónô "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Sprôwdzanié menadżera paczétów"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Przëszëkòwanié aktualizacëjów nie darzëło sã"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Dobëcé elementów nótrnych do aktualizacëji nie darzëło sã"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -607,7 +607,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -616,23 +616,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Aktualizacëjô wëdowiédzë ò respòzëtorëjach"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Lëchô wëdowiédzô ò paczétach"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -644,40 +644,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Zladënk"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Zaktualnienié"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Zaktualnienié zakùńczoné"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Szëkba za stôrą softwôrą"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Zaktualnienié systemë dzrzëło sã"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Dzélowô aktualizacëjô skùńcoznô"
@@ -706,44 +706,44 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Zrëszenié nôrzãdza aktualizacëji nie darzëło sã"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Pòdpisënk nôrzãdza aktualizacëji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Nôrzãdze aktualizacëji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Zladënk nie darzëł sã"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Zladënk aktualizacëji nie darzëł sã. Mòże to òznôczac problemë z sécą. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Ùdowierzanié nie darzëło sã"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -751,11 +751,11 @@
"Ùdowierzanié aktualizacëji nie darzëło sã. Mòże je to problem z sécą abò "
"serwerã. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Rozpakòwëwanié nie darzëło sã"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -763,11 +763,11 @@
"Rozpakòwëwanié aktualizacëji nie darzëło sã. Mòże je to problem z sécą abò "
"serwerã. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Werifikacëjô nie darzëła sã"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -775,18 +775,18 @@
"Werifikacëjô aktualizacëji nie darzëła sã. Mòże je to problem z sécą abò "
"serwerã. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Ni mòże nacząc aktualizacëji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Zamkłosc wiadła felë: \\\"%s\\\""
@@ -884,11 +884,11 @@
"\n"
"Jisc dali?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -896,11 +896,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Felënk procesora ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -908,11 +908,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Felënk przëstãpù do procesu init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -922,11 +922,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1634,11 +1634,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Zladënk nôrzãdza aktualizacëji wëdôwkù"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Sprôwdzë mòżnotã zaktualnieniô do nônowszi testowi wersëji"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1711,20 +1711,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Zrëszë 'do-release-upgrade', abë zaktualnic."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Przëstãpnô je aktualizacëjô do Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Pòcësniãto aktualizacëjã do Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/cs.po ubuntu-release-upgrader-17.10.1/po/cs.po
--- ubuntu-release-upgrader-17.04.7/po/cs.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/cs.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"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: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: cs\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server pro zemi „%s“"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hlavní server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Uživatelem vybrané servery"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nebylo možné vypočítat záznam v sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Nelze najít žádné soubory balíčků, pravděpodobně toto není disk Ubuntu nebo "
"obsahuje nesprávnou architekturu?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Selhalo přidávání CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Chybová zpráva byla:\n"
"„%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Odstranit balíček ve špatném stavu"
msgstr[1] "Odstranit balíčky ve špatném stavu"
msgstr[2] "Odstranit balíčky ve špatném stavu"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +101,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server je možná přetížený"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Poškozené balíčky"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -119,7 +119,7 @@
"nebo apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -137,12 +137,12 @@
" * Neoficiálními softwarovými balíky neposkytovanými Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Toto je pravděpodobně pouze dočasný problém, prosím zkuste to znovu později."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -150,15 +150,15 @@
"Pokud se nic z toho nezdaří, nahlaste prosím chybu pomocí příkazu 'ubuntu-"
"bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nelze vypočítat přechod na vyšší verzi"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Chyba při ověřování některých balíčků"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -168,7 +168,7 @@
"problém v síti. Zkuste to prosím později. Níže je uveden seznam postižených "
"balíčků."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -176,22 +176,22 @@
"Balíček „%s“ je označen k odstranění, ale přitom je uveden v seznamu "
"neodstranitelných."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Stěžejní balíček „%s“ je označen k odstranění."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Pokus o instalaci zakázané verze „%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nelze nainstalovat „%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -199,11 +199,11 @@
"Nebylo možné nainstalovat požadovaný balík. Prosím, nahlaste chybu pomocí "
"zadání \"ubuntu-bug ubuntu-release-upgrader-core\" do terminálu."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nelze odhadnout meta-balíček"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -533,7 +533,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Propočítávají se změny"
@@ -555,7 +555,7 @@
"původního stavu. Pokračovat v přechodu na vyšší verzi můžete později."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nepodařilo se stáhnout novější vydání"
@@ -570,27 +570,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Chyba při potvrzování"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Obnovuje se původní stav systému"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nepodařilo se nainstalovat aktualizace"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -598,7 +598,7 @@
"Přechod na novější vydání byl přerušen. Váš systém by mohl být v "
"nepoužitelném stavu. Nyní bude spuštěna obnova (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -615,7 +615,7 @@
"soubory z /var/log/dist-upgrade/ \n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -623,20 +623,20 @@
"Přechod na novější vydání byl přerušen. Zkontrolujte prosím své internetové "
"připojení nebo instalační média a zkuste to znovu. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Odstranit zastaralé balíčky?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Ponechat"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Odst_ranit"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -646,34 +646,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Požadované závislosti nejsou nainstalovány"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Požadovaná závislost „%s“ není nainstalována. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kontroluje se správce balíčků"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Příprava přechodu na vyšší verzi selhala"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "Příprava systému na povýšení selhala, proces hlášení chyby zahájen."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -681,12 +681,12 @@
"Příprava systému na povýšení selhala. Pro nahlášení chyby nainstalujte "
"apport a spusťte 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Získání potřebných prostředků pro povýšení systému selhalo"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -698,7 +698,7 @@
"\n"
"Navíc byl zahájen proces hlášení chyby."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -712,23 +712,23 @@
"Pro nahlášení chyby nainstalujte apport a spusťte 'apport-bug ubuntu-release-"
"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Aktualizují se informace o repozitářích"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Nepodařilo se přidat cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Promiňte, přidání cdrom nebylo úspěšné."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Neplatná informace o balíčku"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -745,41 +745,41 @@
"/etc/apt/sources.list pro aktuální seznam zdrojů softwaru.\n"
"V případě přetíženého zrcadla zkuste provést aktualizaci později."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Získává se"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Probíhá přechod na vyšší verzi"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Povýšení systému hotovo"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Přechod na vyšší verzi byl dokončen, ale během povyšování nastaly chyby."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Vyhledává se zastaralý software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Přechod na vyšší verzi systému je dokončen."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Částečné povýšení systému bylo dokončeno."
@@ -808,17 +808,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "ověřit '%(file)s' proti '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "rozbaluje se '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nelze spustit nástroj pro aktualizaci"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -826,27 +826,27 @@
"Toto vypadá jako chyba v průvodci aktualizací. Prosím, nahlaste chybu "
"příkazem \"ubuntu-bug ubuntu-release-upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Podpis aktualizačního nástroje"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Aktualizační nástroj"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Stahování selhalo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Stažení aktualizace selhalo. Pravděpodobně je problém se sítí. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Selhalo ověření pravosti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -854,34 +854,34 @@
"Ověření pravosti aktualizace selhalo. Může jít o problém se sítí nebo se "
"serverem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Rozbalení selhalo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Rozbalení aktualizace selhalo. Může být problém se sítí nebo se serverem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Ověření selhalo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Ověření aktualizace selhalo. Může jít o problém se sítí nebo se serverem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nelze spustit povýšení systému"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -889,7 +889,7 @@
"Toto se obvykle stává v pokud je /tmp připojen jako noexec. Prosím připojte "
"/tmp bez noexec a spusťte upgrade znovu."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Chybová zpráva zní „%s“."
@@ -1000,11 +1000,11 @@
"\n"
"Přejete si pokračovat?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nenalezeno CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1015,11 +1015,11 @@
"balíky byly sestaveny s optimalizací vyžadující minimální architekturu i686. "
"S tímto hardwarem není možné povýšit váš systém na nové vydání Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nemáte procesor ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1031,11 +1031,11 @@
"požadujícími minimálně architekturu ARMv6. S tímto hardwarem není možné "
"povýšit váš systém na nové vydání Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Není k dispozici žádný démon init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1051,11 +1051,11 @@
"\n"
"Opravdu chcete pokračovat?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE není povoleno"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1799,12 +1799,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Stahuje se nástroj pro přechod na novější vydání"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Zkontrolovat, zda je možné povýšit systém na nejnovější vývojové vydání"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1883,20 +1883,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Spusťte „do-release-upgrade“ pro povýšení systému na toto vydání."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Správce aktualizací"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Přechod na Ubuntu %(version)s k dispozici"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Odmítli jste přechod na Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Přidat ladící výstup"
diff -Nru ubuntu-release-upgrader-17.04.7/po/cv.po ubuntu-release-upgrader-17.10.1/po/cv.po
--- ubuntu-release-upgrader-17.04.7/po/cv.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/cv.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: cv\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' lartajmarămăr"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Kălar"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/cy.po ubuntu-release-upgrader-17.10.1/po/cy.po
--- ubuntu-release-upgrader-17.04.7/po/cy.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/cy.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: cy\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Gweinydd ar gyfer %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Prif weinydd"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Gweinyddion addasiedig"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Methu cyfrifo cofnod sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Methu cael hyd i ffeiliau pecynnau, efallai mai nid disg Ubuntu yw hwn, "
"neu'r math o adeiladaeth anghywir?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Methu ychwanegu'r CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,7 +69,7 @@
"Y neges gwall oedd:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Tynnu pecyn mewn cyflwr gwael"
@@ -77,7 +77,7 @@
msgstr[2] "Tynnu pecynnau mewn cyflwr gwael"
msgstr[3] "Tynnu pecynnau mewn cyflwr gwael"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -105,15 +105,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Efallai bod gormod o lwyth ar y gweinydd"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -122,7 +122,7 @@
"hwn. Trwsia nhw'n gyntaf drwy ddefnyddio synaptic neu apt-get cyn parhau."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,26 +133,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Mwy na thebyg mai problem dros dro yw hon, rho gynnig arall arni'n hwyrach."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Methu cyfrifo'r uwchraddiad"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Gwall wrth ddilysu rhai pecynnau"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -162,7 +162,7 @@
"dros dro yw hon. Rho gynnig arni wedyn. Gweler isod am restr o becynnau sydd "
"heb eu dilysu."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -170,32 +170,32 @@
"Marciwyd pecyn '%s' ar gyfer ei dynnu ond mae yn rhestr ddu pecynnau i'w "
"tynnu."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Marciwyd y pecyn hanfodol '%s' i'w dynnu."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Ceisio gosod fersiwn rhestr ddu '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Methu gosod '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Methu dyfalu pecyn-meta"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -501,7 +501,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Cyfrifo'r newidiadau"
@@ -521,7 +521,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Methu lawrthwytho'r uwchraddiad"
@@ -533,27 +533,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Gwall wrth gyflwyno"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Adfer cyflwr gwreiddiol y system"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Methu gosod yr uwchraddiad"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -561,7 +561,7 @@
"Mae'r uwchraddiad wedi terfynu. Efallai fod cyflwr nad oes modd ei "
"ddefnyddio ar dy system. Bydd adferiad yn rhedeg nawr (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -572,7 +572,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -580,20 +580,20 @@
"Mae'r uwchraddiad wedi terfynu. Gwiria dy gysylltiad rhyngrwyd neu gyfrwng "
"gosod a thrio eto. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Tynnu pecynnau darfodedig?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Cadw"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Tynnu"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -602,45 +602,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Dyw'r dibyniaeth angenrheidiol '%s' ddim wedi ei osod. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Gwirio rheolwr pecynnau"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Methwyd paratoi'r uwchraddiad"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Methwyd paratoi rhagblaen ar gyfer uwchraddio"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -648,7 +648,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -657,23 +657,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Diweddaru gwybodaeth cronfeydd"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Gwybodaeth pecyn annilys"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -685,40 +685,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Cyrchu"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Uwchraddio"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Uwchraddiad wedi cwblhau"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Mae'r uwchraddiad wedi cwblhau ond roedd gwallau yn ystod y broses."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Chwilio am feddalwedd darfodedig"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Uwchraddio'r sytem wedi cwblhau."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Uwchraddiad rhannol wedi cwblhau."
@@ -747,43 +747,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Methu rhedeg y teclyn uwchraddio"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Llofnod teclyn uwchraddio"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Teclyn uwchraddio"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Methwyd cyrchu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Methwyd cyrchu'r uwchraddiad. Efallai bod problem rhwydwaith. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Methwyd dilysu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -791,11 +791,11 @@
"Methwyd cadarnhau dilysrwydd yr uwchraddiad. Efallai bod problem gyda'r "
"rhwydwaith neu'r gweinydd. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Methwyd echdynnu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -803,11 +803,11 @@
"Methwyd echdynnu'r uwchraddiad. Efallai bod problem gyda'r rhwydwaith neu'r "
"gweinydd. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Methwyd dilysu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -815,18 +815,18 @@
"Methwyd dilysu'r uwchraddiad. Efallai bod problem gyda'r rhwydwaith neu'r "
"gweinydd. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Methu rhedeg yr uwchraddiad"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Y neges gwall yw '%s'."
@@ -927,11 +927,11 @@
"\n"
"Wyt ti eisiau parhau?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Dim CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -943,11 +943,11 @@
"Nid yw'n bosib uwchraddio dy system i fersiwn newydd o Ubuntu gyda'r "
"caledwedd hwn."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Dim CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -959,11 +959,11 @@
"bod yn gweithio. Nid yw'n bosib uwchraddio dy system i fersiwn newydd o "
"Ubuntu gyda'r caledwedd hwn."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Dim init ar gael"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -978,11 +978,11 @@
"\n"
"Wyt ti'n siwr dy fod eisiau parhau?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1723,12 +1723,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Lawrlwytho'r teclyn uwchraddio fersiwn"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Gwirio i weld os yw'n bosib uwchraddio i'r fersiwn datblygol diweddaraf"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "Ceisio uwchraddio i'r fersiwn diweddaraf o $distro-proposed"
@@ -1805,20 +1805,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Rheda 'do-release-upgrade' i uwchraddio i hwn."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Uwchraddiad i Ubuntu %(version)s Ar Gael"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Rwyt ti wedi penderfynu peidio uwchraddio i Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/da.po ubuntu-release-upgrader-17.10.1/po/da.po
--- ubuntu-release-upgrader-17.04.7/po/da.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/da.po 2017-04-24 21:05:20.000000000 +0000
@@ -9,18 +9,18 @@
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
"POT-Creation-Date: 2015-10-07 09:44-0700\n"
"PO-Revision-Date: 2013-06-19 19:08+0000\n"
-"Last-Translator: Aputsiaĸ Niels Janussen \n"
+"Last-Translator: Aputsiak Niels Janussen \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: da\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hovedserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Brugerdefinerede servere"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Kunne ikke beregne sources.list-linje"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Kunne ikke finde nogen pakkefiler, måske er dette ikke en Ubuntu-disk eller "
"også er det en forkert arkitektur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Kunne ikke tilføje cd"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Fejlmeddelelsen var:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Fjern pakke som er i en dårlig tilstand"
msgstr[1] "Fjern pakker som er i en dårlig tilstand"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -93,15 +93,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Serveren er muligvis overbelastet"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -110,7 +110,7 @@
"program. Reparér dem venligst med synaptic eller apt-get før du fortsætter."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -129,11 +129,11 @@
"installeret.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Dette er højst sandsynligt et forbigående problem, prøv igen senere."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -141,15 +141,15 @@
"Hvis intet af dette gælder, så rapportér venligst denne fejl med brug af "
"kommandoen \"ubuntu-bug ubuntu-release-upgrader-core\" i en terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Kunne ikke beregne opgraderingen"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fejl ved godkendelse af nogle pakker"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -159,7 +159,7 @@
"med netværket. Det anbefales, at du prøver igen senere. Se længere nede "
"listen over pakker som ikke kunne godkendes."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -167,22 +167,22 @@
"Pakken \"%s\" er markeret til fjernelse, men den er i listen over pakker, "
"der ikke må fjernes."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Den nødvendige pakke \"%s\" er markeret til fjernelse."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Forsøger at installere sortlistet version \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Kan ikke installere \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -191,11 +191,11 @@
"som en fejl ved at angive 'ubuntu-bug ubuntu-release-upgrader-core' i en "
"terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Kan ikke gætte meta-pakke"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -521,7 +521,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Udregner ændringerne"
@@ -544,7 +544,7 @@
"tidspunkt."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Kunne ikke hente opgraderingerne"
@@ -559,27 +559,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Fejl under gennemførelse"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Genskaber oprindelig systemtilstand"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Kunne ikke installere opgraderingerne"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -587,7 +587,7 @@
"Opgraderingen er blevet afbrudt. Dit system kan være ude af stand til at "
"starte. Der vil nu blive kørt en genoprettelse (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -604,7 +604,7 @@
"vedhæft filerne i /var/log/dist-upgrade/ til fejlrapporten.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -612,20 +612,20 @@
"Opgraderingen er blevet afbrudt. Kontroller venligst din internetforbindelse "
"og installationsmedie og prøv igen. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Fjern forældede pakker?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Behold"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Fjern"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -635,28 +635,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Påkrævede afhængigheder er ikke installeret"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Den påkrævede afhængighed \"%s\" er ikke installeret. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kontrollerer pakkehåndtering"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Klargøring af opgraderingen fejlede"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -664,7 +664,7 @@
"Forberedelse af systemet til opgradering mislykkedes, så der startes nu en "
"fejlrapporteringsproces."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -673,12 +673,12 @@
"en fejlrapport, så installér apport og udfør dernæst 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Hentning af opgraderingsforudsætninger fejlede"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -690,7 +690,7 @@
"\n"
"Der ud over startes en fejlrapporteringsproces."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,23 +705,23 @@
"For at indsende en fejlrapport, så installér apport og udfør dernæst 'apport-"
"bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Opdaterer arkivinformation"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Fejl under tilføjelse af cd-rom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Beklager, tilføjelse af cd-rom'en mislykkedes."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ugyldig pakkeinformation"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -740,41 +740,41 @@
"I tilfælde af en overbelastet spejlserver, kan du forsøge at opgradere igen "
"senere."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Henter"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Opgraderer"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Opgradering gennemført"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Opgraderingen er afsluttet, men der opstod fejl under opgraderingsprocessen."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Søger efter forældet software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Systemopgradering er fuldført."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Den delvise opgradering er færdig."
@@ -803,17 +803,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "godkend '%(file)s' mod '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "pakker \"%s\" ud"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Kunne ikke køre opgraderingsværktøjet"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -822,28 +822,28 @@
"venligst dette som en fejl, med brug af kommandoen \"ubuntu-bug ubuntu-"
"release-upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Opgradér værkstøjets signatur"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Opgraderingsværktøj"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Fejl ved hentning"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Hentning af opgraderingen fejlede. Dette kan skyldes et netværksproblem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Godkendelse mislykkedes"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -851,11 +851,11 @@
"Godkendelse af opgraderingen fejlede. Der er muligvis et problem med "
"netværket eller med serveren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Fejl ved udpakning"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -863,11 +863,11 @@
"Udpakning af opgraderingen fejlede. Dette kan skyldes et problem med "
"netværket eller med serveren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifikation mislykkedes"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -875,12 +875,12 @@
"Efterprøvning af opgraderingen fejlede. Det skyldes muligvis et problem med "
"netværket eller serveren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Kan ikke køre opgraderingen"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -888,7 +888,7 @@
"Dette er normalt forårsaget af et system hvor /tmp er monteret noexec. "
"Montér venligst uden noexec og kør opgraderingen igen."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Fejlmeddelelsen er \"%s\"."
@@ -1000,11 +1000,11 @@
"\n"
"Vil du fortsætte?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ikke en i686 cpu"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1016,11 +1016,11 @@
"minimum. Det er ikke muligt at opgradere dit system til en nyere udgave af "
"Ubuntu med denne hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ingen ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1032,11 +1032,11 @@
"minimale arkitektur. Det er ikke muligt at opgradere dit system til en ny "
"Ubuntu-udgave med denne hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Ingen tilgængelig init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1051,11 +1051,11 @@
"\n"
"Er du sikker på at du vil fortsætte?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE er ikke slået til"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1786,12 +1786,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Hent værktøjet til udgivelsesopgraderingen"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Undersøg om det er muligt at opgradere til den seneste udviklerudgivelse"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1870,20 +1870,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Kør \"do-release-upgrade\" for at opgradere til den."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Softwareopdatering"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Opgradering til Ubuntu %(version)s er tilgængelig"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Du har afslået at opgradere til Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Tilføj fejlsøgningsuddata"
diff -Nru ubuntu-release-upgrader-17.04.7/po/de.po ubuntu-release-upgrader-17.10.1/po/de.po
--- ubuntu-release-upgrader-17.04.7/po/de.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/de.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server für %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hauptserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Benutzerdefinierte Server"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Eintrag für sources.list konnte nicht erstellt werden"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"Es konnten keine Paketdateien gefunden werden, möglicherweise ist dies keine "
"Ubuntu-CD oder die falsche Architektur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Hinzufügen der CD gescheitert"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -71,13 +71,13 @@
"Die Fehlermeldung war:\n"
"%s"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Defektes Paket entfernen"
msgstr[1] "Defekte Pakete entfernen"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -98,15 +98,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Der Server ist möglicherweise überlastet"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Defekte Pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -116,7 +116,7 @@
"der Pakete, bevor Sie fortfahren."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -134,13 +134,13 @@
" * Inoffizielle Softwarepakete, die nicht von Ubuntu bereitgestellt wurden\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Dies ist wahrscheinlich ein vorübergehendes Problem.\n"
"Bitte versuchen Sie es zu einem späteren Zeitpunkt erneut."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -148,17 +148,17 @@
"Falls nichts von dem zutrifft, melden Sie diesen Fehler bitte, indem Sie den "
"Befehl »ubuntu-bug ubuntu-release-upgrader-core« in einem Terminal ausführen."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
"Es konnte nicht ermittelt werden, welche Systemaktualisierungen verfügbar "
"sind"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fehler bei der Echtheitsprüfung einiger Pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -169,7 +169,7 @@
"späteren Zeitpunkt noch einmal. Unten stehend sehen Sie eine Liste "
"derjenigen Pakete, deren Echtheit nicht bestätigt werden konnte."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -177,24 +177,24 @@
"Das Paket »%s« ist zum Löschen vorgesehen, wurde aber durch das System "
"gesperrt."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Das unbedingt notwendige Paket »%s« ist zum Löschen vorgesehen."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Es wird versucht, die auf der schwarzen Liste stehende Version »%s« zu "
"installieren"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "»%s« kann nicht installiert werden"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -203,11 +203,11 @@
"Sie diesen Fehler, indem Sie im Terminal den Befehl »ubuntu-bug ubuntu-"
"release-upgrader-core« eingeben."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Metapaket konnte nicht bestimmt werden"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -547,7 +547,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Änderungen werden berechnet"
@@ -570,7 +570,7 @@
"später fortsetzen."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden"
@@ -585,27 +585,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Fehler beim Anwenden"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Ursprünglicher Systemzustand wird wieder hergestellt"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Die Aktualisierungen konnten nicht installiert werden"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -614,7 +614,7 @@
"nicht verwendbaren Zustand befinden. Eine Wiederherstellung wird gestartet "
"(»dpkg --configure -a«)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -632,7 +632,7 @@
"an.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -640,20 +640,20 @@
"Die Systemaktualisierung wurde abgebrochen. Bitte prüfen Sie Ihre "
"Internetverbindung oder Ihr Installationsmedium und versuchen Sie es erneut. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Veraltete Pakete entfernen?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Beibehalten"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Entfernen"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -663,12 +663,12 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
"Die aufgrund von Abhängigkeiten notwendigen Pakete sind nicht installiert."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
@@ -677,17 +677,17 @@
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Paketverwaltung wird überprüft"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Vorbereitung der Systemaktualisierung gescheitert"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -695,7 +695,7 @@
"Die Vorbereitung des Systems zur Aktualisierung ist fehlgeschlagen, die "
"Fehlerberichterstattung wurde somit gestartet."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -704,12 +704,12 @@
"Fehlerbericht zu erstellen, installieren Sie »Apport« und führen sie dann "
"»apport-bug ubuntu-release-upgrader« in einer Kommandozeile aus."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Beziehen der Erfordernisse für die Systemaktualisierung gescheitert"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -722,7 +722,7 @@
"\n"
"Außerdem wird der Fehlermeldevorgang gestartet."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -737,23 +737,23 @@
"Um einen Fehlerbericht zu erstellen, installieren Sie »Apport« und führen "
"sie dann »apport-bug ubuntu-release-upgrader« in einer Kommandozeile aus."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Informationen zu Paketquellen werden aktualisiert"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "CD-ROM konnte nicht hinzugefügt werden"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Entschuldigung, das Hinzufügen der CD-ROM ist fehlgeschlagen."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ungültige Paketinformationen"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -772,42 +772,42 @@
"/etc/apt/sources.list. Im Falle eines überlasteten Spiegel-Servers können "
"Sie es später erneut versuchen."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Herunterladen"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Systemaktualisierung wird durchgeführt"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Systemaktualisierung wurde abgeschlossen"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Die Systemaktualisierung wurde vollständig abgeschlossen, jedoch traten "
"während der Systemaktualisierung Fehler auf."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Es wird nach veralteter Software gesucht"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Die Systemaktualisierung ist abgeschlossen."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Teilweise Systemaktualisierung abgeschlossen."
@@ -836,17 +836,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "»%(file)s« wird gegenüber »%(signature)s« legitimiert "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "»%s« wird entpackt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Die Aktualisierungsanwendung konnte nicht gestartet werden"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -855,29 +855,29 @@
"Aktualisierungswerkzeug. Bitter berichten Sie den Fehler mit dem Befehl "
"»ubuntu-bug ubuntu-release-upgrader-core«."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signatur der Aktualisierungsanwendung"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Aktualisierungsanwendung"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Herunterladen gescheitert"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Das Herunterladen der Systemaktualisierung ist gescheitert. Möglicherweise "
"gibt es ein Netzwerkproblem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Legitimierung gescheitert"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -885,11 +885,11 @@
"Die Systemaktualisierung konnten nicht auf ihre Echtheit überprüft werden. "
"Möglicherweise gibt es Probleme mit dem Netzwerk oder mit dem Server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Entpacken gescheitert"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -897,11 +897,11 @@
"Die Systemaktualisierung konnte nicht entpackt werden. Möglicherweise gibt "
"es ein Problem mit dem Netzwerk oder mit dem Server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Überprüfung gescheitert"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -909,12 +909,12 @@
"Die Überprüfung der Systemaktualisierung ist gescheitert. Möglicherweise "
"gibt es ein Problem mit dem Netzwerk oder mit dem Server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Systemaktualisierung kann nicht durchgeführt werden"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -923,7 +923,7 @@
"eingehängt ist. Bitte hängen Sie /tmp ohne noexec ein und führen Sie die "
"Aktualisierung erneut aus."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Die Fehlermeldung lautet »%s«."
@@ -1040,11 +1040,11 @@
"\n"
"Möchten Sie fortfahren?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Kein i686-Prozessor vorhanden"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1057,11 +1057,11 @@
"Hardware nicht möglich, Ihren Rechner auf eine neue Ubuntu-Version zu "
"aktualisieren."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Kein ARMv6-Prozessor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1073,11 +1073,11 @@
"als minimale Architektur erfordern. Es ist nicht möglich, mit dieser "
"Hardware Ihr System auf eine neue Ubuntu-Version zu aktualisieren."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Kein init verfügbar"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1093,11 +1093,11 @@
"\n"
"Sind Sie sicher, dass Sie fortfahren möchten?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE ist nicht aktiviert."
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1849,12 +1849,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Das Freigabeaktualisierungswerkzeug wird heruntergeladen"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Möglichkeit einer Aktualisierung auf die aktuelle Entwicklungsversion prüfen"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1936,20 +1936,22 @@
"Führen Sie den Befehl »do-release-upgrade« aus, um auf die neue Ubuntu-"
"Freigabe zu aktualisieren."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Aktualisierungsverwaltung"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s-Systemaktualisierung verfügbar"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Sie haben die Systemaktualisierung auf Ubuntu %s abgelehnt"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Fehlerdiagnoseausgabe hinzufügen"
diff -Nru ubuntu-release-upgrader-17.04.7/po/dv.po ubuntu-release-upgrader-17.10.1/po/dv.po
--- ubuntu-release-upgrader-17.04.7/po/dv.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/dv.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: dv\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s ގެ ސަރވަރ"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "މައި ސަރވަރ"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "އެހެނިހެން ސަރވަރތައް"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "އެއްވެސް ސޯރސް ލިސްޓް އެންޓްރީއެއް ނުފެނުނު"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"އެއްވެސް ޕެކޭޖެއް ނުފެނުނު، މިއީ އުބުންޓުގެ ނިސްކެއް ނޫން ނުވަތަ މި ޑިސްކް "
"އެލުލަވާލެވިފައިވަނީ ރަނގަޅަކަށް ނޫން"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "ސީޑީ އެއް ނުކުރެވި ފޭލްވެއްޖެ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -84,22 +84,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -110,63 +110,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' އިންސްޓޯލެއް ނުކުރެވުނު"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -417,7 +417,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -437,7 +437,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -449,33 +449,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -486,26 +486,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_ބަހައްޓާ"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "އުނިކު_ރޭ"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -513,45 +513,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -559,7 +559,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -568,23 +568,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -596,40 +596,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -658,80 +658,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -825,11 +825,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -837,11 +837,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -849,11 +849,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -863,11 +863,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1542,11 +1542,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1614,19 +1614,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/el.po ubuntu-release-upgrader-17.10.1/po/el.po
--- ubuntu-release-upgrader-17.04.7/po/el.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/el.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: el\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Διακομιστής για %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Κύριος διακομιστής"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Προσαρμοσμένοι διακομιστές"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Δεν μπορεί να υπολογιστεί η εισαγωγή του sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Αδυναμία εύρεσης πακέτων. Ενδεχομένως αυτός δεν είναι ένας δίσκος Ubuntu ή η "
"αρχιτεκτονική είναι λανθασμένη;"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Αποτυχία προσθήκης του CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Το μήνυμα σφάλματος ήταν:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Αφαίρεση πακέτου που βρίσκεται σε κακή κατάσταση"
msgstr[1] "Αφαίρεση πακέτων που βρίσκονται σε άσχημη κατάσταση"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Ο διακομιστής μπορεί να είναι υπερφορτωμένος"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Κατεστραμμένα πακέτα"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"get για να συνεχίσετε."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -132,13 +132,13 @@
" * Ανεπίσημα πακέτα λογισμικού που δεν παρέχονται από το Ubuntu.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη.\n"
"Προσπαθήστε ξανά αργότερα."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -147,15 +147,15 @@
"χρησιμοποιώντας την εντολή «ubuntu-bug ubuntu-release-upgrader-core» στο "
"τερματικό."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Αδυναμία υπολογισμού της αναβάθμισης"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -165,7 +165,7 @@
"σε πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα μη "
"πιστοποιημένων πακέτων."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -173,22 +173,22 @@
"Το πακέτο '%s' σημειώθηκε για απομάκρυνση αλλά είναι στη μαύρη λίστα "
"απομάκρυνσης."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Το απαραίτητο πακέτο '%s' έχει επισημανθεί για απομάκρυνση."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Προσπάθεια εγκατάστασης έκδοσης '%s' καταχωρημένης σε μαύρη λίστα"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Αδυναμία εγκατάστασης '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -197,11 +197,11 @@
"το ως σφάλμα χρησιμοποιώντας την «ubuntu-bug ubuntu-release-upgrader-core» "
"στο τερματικό."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Αδυναμία εύρεσης μετα-πακέτου"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -535,7 +535,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Έλεγχος αλλαγών"
@@ -557,7 +557,7 @@
"κατάσταση. Μπορείτε να συνεχίσετε την αναβάθμιση αργότερα."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Αδυναμία λήψης αναβαθμίσεων"
@@ -572,27 +572,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Σφάλμα κατά την υποβολή"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Πραγματοποιείται επαναφορά της αρχικής κατάστασης συστήματος"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Αδυναμία εγκατάστασης αναβαθμίσεων"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -600,7 +600,7 @@
"Εγκατάλειψη αναβάθμισης. Είναι πιθανόν να έχει αχρηστευθεί το σύστημά σας. "
"Θα εκτελεστεί η εφαρμογή ανάκτησης (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -618,7 +618,7 @@
"/var/log/dist-upgrade/ .\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -626,20 +626,20 @@
"Εγκατάλειψη αναβάθμισης. Παρακαλώ ελέγξτε την σύνδεσή σας στο διαδίκτυο ή το "
"μέσο εγκατάστασης και δοκιμάστε ξανά. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Αφαίρεση παρωχημένων πακέτων;"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Διατήρηση"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Αφαίρεση"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -649,28 +649,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Οι απαιτούμενες εξαρτήσεις δεν έχουν εγκατασταθεί"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Η απαιτούμενη εξάρτηση '%s' δεν έχει εγκατασταθεί. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Έλεγχος διαχειριστή πακέτων"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Απέτυχε η προετοιμασία της αναβάθμισης"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -678,7 +678,7 @@
"Η προετοιμασία του συστήματος για αναβάθμιση απέτυχε οπότε εκκινείται η "
"διαδικασία αναφοράς σφάλματος."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -687,12 +687,12 @@
"ένα σφάλμα εγκαταστήστε την εφαρμογή apport και έπειτα εκτελέστε την εντολή "
"«apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Απέτυχε η λήψη των προαπαιτούμενων για την αναβάθμιση"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,7 +705,7 @@
"\n"
"Επιπροσθέτως, έχει ξεκινήσει η διαδικασία αναφορά του σφάλματος."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -720,23 +720,23 @@
"Για να αναφέρετε ένα σφάλμα εγκαταστήστε το apport και έπειτα εκτελέστε την "
"εντολή «apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ενημέρωση πληροφοριών αποθετηρίου"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Αποτυχία προσθήκης CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Λυπούμαστε , η προσθήκη CD-ROM δεν ήταν επιτυχής."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Μη έγκυρες πληροφορίες πακέτου"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -755,42 +755,42 @@
"Σε περίπτωση προσωρινής απώλειας πρόσβασης σε πηγή, μπορείτε να δοκιμάσετε "
"ξανά την αναβάθμιση αργότερα."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Πραγματοποιούνται λήψεις"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Πραγματοποιείται αναβάθμιση"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Η αναβάθμιση ολοκληρώθηκε"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Η αναβάθμιση έχει ολοκληρωθεί αλλά υπήρξαν σφάλματα κατά τη διαδικασία "
"αναβάθμισης."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Πραγματοποιείται αναζήτηση για παρωχημένο λογισμικό"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Η μερική αναβάθμιση ολοκληρώθηκε."
@@ -819,17 +819,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "ταυτοποίηση «%(file)s» έναντι «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "αποσυμπίεση '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Αδυναμία εκτέλεσης εργαλείου αναβαθμίσεων"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -838,28 +838,28 @@
"αναφέρετέ το ως σφάλμα χρησιμοποιώντας την εντολή «ubuntu-bug ubuntu-release-"
"upgrader-core»."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Υπογραφή εργαλείου αναβάθμισης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Εργαλείο αναβάθμισης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Αποτυχία ανάκτησης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Αποτυχία ανάκτησης αναβάθμισης. Πιθανόν να υπάρχει πρόβλημα δικτύου. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Αποτυχία πιστοποίησης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -867,11 +867,11 @@
"Αποτυχία πιστοποίησης αναβάθμισης. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
"διακομιστή. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Αποτυχία αποσυμπίεσης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -879,11 +879,11 @@
"Αποτυχία αποσυμπίεσης αναβάθμισης. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
"διακομιστή. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Απουτυχία επαλήθευσης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -891,12 +891,12 @@
"Απουτυχία επαλήθευσης αναβάθμισης. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
"διακομιστή. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Αδυναμία εκτέλεσης αναβάθμισης"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -905,7 +905,7 @@
"noexec (μη εκτελέση). Παρακαλώ προσαρτήστε ξανά δίχως τη σημαία noexec και "
"εκτελέστε πάλι τη διαδικασία αναβάθμισης."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Το μύνημα λάθους είναι '%s'."
@@ -1020,11 +1020,11 @@
"\n"
"Θέλετε να συνεχίσετε;"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Όχι i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1036,11 +1036,11 @@
"ελάχιστη αρχιτεκτονική. Δεν είναι δυνατόν να αναβαθμίσετε το σύστημά σας σε "
"νέα έκδοση του Ubuntu με αυτό το υλικό."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Δεν υπάρχει ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1052,11 +1052,11 @@
"απαιτούν τουλάχιστον την ARMv6 ως αρχιτεκτονική. Δεν είναι δυνατή η "
"αναβάθμιση του συστήματός σας στη νέα διανομή Ubuntu με αυτό το υλικό."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Μη διαθέσιμη αρχικοποίηση"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1072,11 +1072,11 @@
"\n"
"Θέλετε σίγουρα να συνεχίσετε;"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "Η επέκταση PAE δεν είναι ενεργή"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1818,12 +1818,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Λήψη του εργαλείου αναβάθμισης έκδοσης"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Έλεγχος για την δυνατότητα αναβάθμισης στην τελευταία έκδοση ανάπτυξης"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1903,20 +1903,22 @@
msgstr ""
"Εκτελέστε την εντολή 'do-release-upgrade' για να αναβαθμίσετε σε αυτήν."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Πρόγραμμα ενημέρωσης λογισμικού"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Η αναβάθμιση του Ubuntu %(version)s είναι διαθέσιμη"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Αρνηθήκατε τη αναβάθμιση σε Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Προσθήκη εξόδου αποσφαλμάτωση"
diff -Nru ubuntu-release-upgrader-17.04.7/po/en_AU.po ubuntu-release-upgrader-17.10.1/po/en_AU.po
--- ubuntu-release-upgrader-17.04.7/po/en_AU.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/en_AU.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Main server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Could not calculate sources.list entry"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Unable to locate any package files, perhaps this is not an Ubuntu Disc or "
"the wrong architecture?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Failed to add the CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"The error message was:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remove package in bad state"
msgstr[1] "Remove packages in bad state"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "The server may be overloaded"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Broken packages"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"software. Please fix them first using synaptic or apt-get before proceeding."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,11 +130,11 @@
" * Unofficial software packages not provided by Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "This is most likely a transient problem, please try again later."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -142,15 +142,15 @@
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Could not calculate the upgrade"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error authenticating some packages"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -160,29 +160,29 @@
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"The package '%s' is marked for removal but it is in the removal blacklist."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "The essential package '%s' is marked for removal."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Trying to install blacklisted version '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Can't install '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -190,11 +190,11 @@
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Can't guess meta-packag"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -516,7 +516,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculating the changes"
@@ -538,7 +538,7 @@
"You can resume the upgrade at a later time."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Could not download the upgrades"
@@ -552,27 +552,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error during commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restoring original system state"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Could not install the upgrades"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -580,7 +580,7 @@
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -597,7 +597,7 @@
"and attach the files in /var/log/dist-upgrade/ to the bug report.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -605,20 +605,20 @@
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Remove obsolete packages?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Keep"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Remove"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -628,28 +628,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Required depends is not installed"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "The required dependency '%s' is not installed. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Checking package manager"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparing the upgrade failed"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -657,7 +657,7 @@
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -665,12 +665,12 @@
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Getting upgrade prerequisites failed"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -682,7 +682,7 @@
"\n"
"Additionally, a bug reporting process is being started."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -696,23 +696,23 @@
"To report a bug install apport and then execute 'apport-bug ubuntu-release-"
"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Updating repository information"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Failed to add the cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Sorry, adding the cdrom was not successful."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Invalid package information"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -731,41 +731,41 @@
"In the case of an overloaded mirror, you may want to try the upgrade again "
"later."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Fetching"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Upgrading"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Upgrade complete"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"The upgrade has completed but there were errors during the upgrade process."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Searching for obsolete software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "System upgrade is complete."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "The partial upgrade has completed."
@@ -794,17 +794,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "authenticate '%(file)s' against '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extracting '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Could not run the upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -812,27 +812,27 @@
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Upgrade tool signature"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Failed to fetch"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Fetching the upgrade failed. There may be a network problem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -840,11 +840,11 @@
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Failed to extract"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -852,11 +852,11 @@
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verification Failed"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -864,12 +864,12 @@
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Cannot run the upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -877,7 +877,7 @@
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "The error message is '%s'."
@@ -987,11 +987,11 @@
"of this driver is available that works with your hardware in Ubuntu 10.04 "
"LTS."
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "No i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1003,11 +1003,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1019,11 +1019,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "No init available"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1040,11 +1040,11 @@
"\n"
"Are you sure you wish to continue?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE not enabled"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1774,11 +1774,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Downloading the release upgrade tool"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Check if upgrading to the latest development release is possible"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1856,20 +1856,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Run 'do-release-upgrade' to upgrade to it."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Software Updater"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s Upgrade Available"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "You have declined the upgrade to Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Add debug output"
diff -Nru ubuntu-release-upgrader-17.04.7/po/en_CA.po ubuntu-release-upgrader-17.10.1/po/en_CA.po
--- ubuntu-release-upgrader-17.04.7/po/en_CA.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/en_CA.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Main server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Could not calculate sources.list entry"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Failed to add the CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"The error message was:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remove package in bad state"
msgstr[1] "Remove packages in bad state"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "The server may be overloaded"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Broken packages"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"software. Please fix them first using synaptic or apt-get before proceeding."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -131,11 +131,11 @@
" * Unofficial software packages not provided by Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "This is most likely a transient problem. Please try again later."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Could not calculate the upgrade"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error authenticating some packages"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,29 +161,29 @@
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"The package '%s' is marked for removal but it is in the removal blacklist."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "The essential package '%s' is marked for removal."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Trying to install blacklisted version '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Can't install '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -191,11 +191,11 @@
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Can't guess meta-package"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -517,7 +517,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculating the changes"
@@ -539,7 +539,7 @@
"You can resume the upgrade at a later time."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Could not download the upgrades"
@@ -553,27 +553,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error during commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restoring original system state"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Could not install the upgrades"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -581,7 +581,7 @@
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -598,7 +598,7 @@
"and attach the files in /var/log/dist-upgrade/ to the bug report.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -606,20 +606,20 @@
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Remove obsolete packages?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Keep"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Remove"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -629,28 +629,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Required depends is not installed"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "The required dependency '%s' is not installed. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Checking package manager"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparing the upgrade failed"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -658,7 +658,7 @@
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -666,12 +666,12 @@
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Getting upgrade prerequisites failed"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -683,7 +683,7 @@
"\n"
"Additionally, a bug reporting process is being started."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -697,23 +697,23 @@
"To report a bug install apport and then execute 'apport-bug ubuntu-release-"
"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Updating repository information"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Failed to add the cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Sorry, adding the cdrom was not successful."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Invalid package information"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -732,41 +732,41 @@
"In the case of an overloaded mirror, you may want to try the upgrade again "
"later."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Fetching"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Upgrading"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Upgrade complete"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"The upgrade has completed but there were errors during the upgrade process."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Searching for obsolete software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "System upgrade is complete."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "The partial upgrade was completed."
@@ -795,17 +795,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "authenticate '%(file)s' against '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extracting '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Could not run the upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -813,27 +813,27 @@
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Upgrade tool signature"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Failed to fetch"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Fetching the upgrade failed. There may be a network problem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -841,11 +841,11 @@
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Failed to extract"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -853,11 +853,11 @@
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verification failed"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -865,12 +865,12 @@
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Can not run the upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -878,7 +878,7 @@
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "The error message is '%s'."
@@ -990,11 +990,11 @@
"\n"
"Do you want to continue?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "No i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1006,11 +1006,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1022,11 +1022,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "No init available"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1042,11 +1042,11 @@
"\n"
"Are you sure you want to continue?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE not enabled"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1775,11 +1775,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Downloading the release upgrade tool"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Check if upgrading to the latest devel release is possible"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1857,20 +1857,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Run 'do-release-upgrade' to upgrade to it."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Software Updater"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s Upgrade Available"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "You have declined the upgrade to Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Add debug output"
diff -Nru ubuntu-release-upgrader-17.04.7/po/en_GB.po ubuntu-release-upgrader-17.10.1/po/en_GB.po
--- ubuntu-release-upgrader-17.04.7/po/en_GB.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/en_GB.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Main server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Could not calculate the sources.list entry"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Unable to locate any package files, perhaps this is not an Ubuntu Disc or "
"the wrong architecture?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Failed to add the CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"The error message was:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remove package in bad state"
msgstr[1] "Remove packages in bad state"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "The server may be overloaded"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Broken packages"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"software. Please fix them first using synaptic or apt-get before proceeding."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,11 +130,11 @@
" * Unofficial software packages not provided by Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "This is most likely a temporary problem, please try again later."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -142,15 +142,15 @@
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Could not determine the upgrade"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error authenticating some packages. Continue?"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -160,29 +160,29 @@
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"The package '%s' is marked for removal but it is in the removal blacklist."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "The essential package '%s' is marked for removal."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Trying to install blacklisted version '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Can't install '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -190,11 +190,11 @@
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Can't guess meta-package"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -516,7 +516,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculating the changes"
@@ -538,7 +538,7 @@
"You can resume the upgrade at a later time."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Could not download the upgrades"
@@ -552,27 +552,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error during commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restoring original system state"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Could not install the upgrades"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -580,7 +580,7 @@
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -597,7 +597,7 @@
"and attach the files in /var/log/dist-upgrade/ to the bug report.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -605,20 +605,20 @@
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Remove obsolete packages?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Keep"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Remove"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -628,28 +628,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Required depends are not installed"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "The required dependency '%s' is not installed. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Checking package manager"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparing the upgrade failed"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -657,7 +657,7 @@
"Preparing the system for the upgrade failed, so a bug reporting process is "
"being started."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -665,12 +665,12 @@
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Getting upgrade prerequisites failed"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -682,7 +682,7 @@
"\n"
"Additionally, a bug reporting process is being started."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -696,23 +696,23 @@
"To report a bug install apport and then execute 'apport-bug ubuntu-release-"
"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Updating repository information"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Failed to add the CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Sorry, adding the CDROM was not successful."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Invalid package information"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -731,41 +731,41 @@
"In the case of an overloaded mirror, you may want to try the upgrade again "
"later."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Fetching"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Upgrading"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Upgrade complete"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"The upgrade has completed but there were errors during the upgrade process."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Searching for obsolete software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "System upgrade is complete."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "The partial upgrade was completed."
@@ -794,17 +794,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "authenticate '%(file)s' against '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extracting '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Could not run the upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -812,27 +812,27 @@
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Upgrade tool signature"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Failed to fetch"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Fetching the upgrade failed. There may be a network problem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -840,11 +840,11 @@
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Failed to extract"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -852,11 +852,11 @@
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verification failed"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -864,12 +864,12 @@
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Cannot run the upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -877,7 +877,7 @@
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "The error message is '%s'"
@@ -989,11 +989,11 @@
"\n"
"Do you wish to continue?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "No i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1005,11 +1005,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1021,11 +1021,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "No init available"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1041,11 +1041,11 @@
"\n"
"Are you sure you want to continue?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE not enabled"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1774,11 +1774,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Downloading the release upgrade tool"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Check if upgrading to the latest devel release is possible"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1856,20 +1856,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Run 'do-release-upgrade' to upgrade to it."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Software Updater"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s Upgrade Available"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "You have declined the upgrade to Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Add debug output"
diff -Nru ubuntu-release-upgrader-17.04.7/po/eo.po ubuntu-release-upgrader-17.10.1/po/eo.po
--- ubuntu-release-upgrader-17.04.7/po/eo.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/eo.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: eo\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servilo por %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Ĉefa servilo"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Propraj serviloj"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Ne eblis kalkuli eron de sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Neeblas trovi ajnan pakaĵdosieron. Ĉu eble ĉi tiu ne estas Ubuntu-disko aŭ "
"neĝustas ĝia arkitekturo?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Malsukcesis aldoni la KD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"La erarmesaĝo estis:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Forigi pakaĵon en erara stato"
msgstr[1] "Forigi pakaĵojn en erara stato"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Eble la servilo estas superŝarĝita"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Difektaj pakaĵoj"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"ripari. Bonvolu ripari ilin per Synaptic aŭ Apt-get antaŭ ol daŭrigi."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,11 +130,11 @@
" * Neoficialaj programaraj pakaĵoj ne provizitaj de Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ĉi tio probable estas maldaŭra problemo, bonvolu reprovi poste."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -142,15 +142,15 @@
"Se nenio el tio rilatas, tiam bonvole raportu tiun cimon per la komando "
"'ubuntu-bug ubuntu-release-upgrader-core' en terminalo."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Ne eblas kalkuli la ĝisdatigon"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Eraro dum aŭtentigado de iuj pakaĵoj"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -159,7 +159,7 @@
"Ne eblis aŭtentigi iujn pakaĵojn, eble pro maldaŭra reta problemo. Eble vi "
"volas reprovi poste. Vidu malsupre por listo de neaŭtentigitaj pakaĵoj."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -167,22 +167,22 @@
"La pakaĵo '%s' estas markita por forigi sed ĝi estas en la nigra listo por "
"forigoj."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "La esenca pakaĵo '%s' estas markita por forigi."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Provo instali version '%s', kiu estas en la nigra listo"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ne eblis instalo de '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -190,11 +190,11 @@
"Ne eblas instali bezonatan pakaĵon. Bonvole raportu tion kiel cimon per la "
"komando 'ubuntu-bug ubuntu-release-upgrader-core' en terminalo."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Ne eblas diveni meta-pakaĵon"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -516,7 +516,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Kalkulado de la ŝanĝoj"
@@ -538,7 +538,7 @@
"povas daŭrigi la ĝisdatigadon je alia fojo."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Ne eblis elŝuti la ĝisdatigojn"
@@ -553,27 +553,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Eraro dum farado"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restarigante originan sisteman staton"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Ne eblis instali la ĝisdatigojn"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -581,7 +581,7 @@
"La ĝisdatigo ĉesiĝis. Via sistemo povas esti en neuzebla stato. "
"Riparproceduro nun ruliĝos (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -598,7 +598,7 @@
"kaj alkroĉi la dosierojn en /var/log/dist-upgrade/ en la raporto de cimo.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -606,20 +606,20 @@
"La ĝisdatigo ĉesiĝis. Bonvolu kontroli vian retkonekton aŭ instal-"
"datumportilojn kaj reprovu. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ĉu forigi arkaikajn pakaĵojn?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "Konservi"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Forigi"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -629,28 +629,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Bezonataj dependaĵoj ne estas instalitaj"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La bezonata dependaĵo '%s' ne estas instalita. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kontrolado de pakaĵa direktisto"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparado de la ĝisdatigo malsukcesis"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -658,7 +658,7 @@
"Pretigado de la sistemo por la ĝisdatigo fiaskis, do raporto de cimo estas "
"startigota."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -666,12 +666,12 @@
"Malsukcesis pretigi la sistemon por la promocio. Por raporti cimon, instalu "
"je apport, kaj tiam rulu je 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Akirado de risursoj bezonataj por la ĝisdatigo malsukcesis"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -683,7 +683,7 @@
"\n"
"Aldone, cimraportaĵo estas farata."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -697,23 +697,23 @@
"Por raporti cimon, instalu je apport, kaj tiam rulu je 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ĝisdatigo de deponeja informo"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Fiaskis aldoni la lumdiskon"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Bedaŭrinde la aldono de la lumdisko fiaskis."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Nevalida pakaĵa informo"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -731,40 +731,40 @@
"Okaze de troŝargata spegulo, vi eble volos reprovi la promocion post iom da "
"tempo."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Prenado"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Aktualigo"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Ĝisdatigo finita"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "La ĝisdatigo kompletiĝis sed okazis eraroj dum la ĝisdatigado."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Serĉado de ne plu uzataj programaroj"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistema ĝisdatigo estas kompleta."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "La parta ĝisdatigo finiĝis."
@@ -793,17 +793,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "aŭtentigi '%(file)s' per '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "eltiras ‘%s’"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Ne eblis ruli la ĝisdatigilon"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -811,27 +811,27 @@
"Tio plej probable estas cimo en la promociilo. Bonvole raportu cimon per la "
"komando 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Ĝisdatigu ilan subskribon"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Ĝisdatigilo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Malsukcesis alporti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Malsukcesis alporti la ĝisdatigon. Eble okazis reta problemo. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Malsukcesis aŭtentikigi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -839,11 +839,11 @@
"Malsukcesis aŭtentikigi la ĝisdatigon. Eble okazis problemo pri la reto aŭ "
"pri la servilo. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Malsukcesis ekstrakti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -851,11 +851,11 @@
"Malsukcesis malpaki la ĝisdatigon. Eble okazis problemo pri la reto aŭ pri "
"la servilo. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Fiaskis la programkontrolo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -863,12 +863,12 @@
"Konfirmado de la ĝisdatigo malsukcesis. Eble estas problemo pri la reto aŭ "
"servilo. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Ne povas ruli la ĝisdatigon"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -876,7 +876,7 @@
"Tio kutime estas kaŭzata pro sistemo kiam /tmp estas surmetita kun noexec. "
"Bonvolu resurmeti sen noexec kaj ruli la promocion denove."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "La erarmesaĝo estas '%s'."
@@ -985,11 +985,11 @@
"versio de tiu pelilo kiu funkcias per via aparataro en Ubuntu 10.04 LTS.\n"
"Ĉu vi volas daŭrigi?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Neniu i686-procesoro"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1000,11 +1000,11 @@
"pakaĵoj kunmetiĝis kun optimigoj kiuj postulas minimume i686-procesoron. Ne "
"eblas ĝisdatigi vian sistemon al nova Ubuntu-eldono kun ĉi tiu aparataro."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ne estas ARMv6-CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1016,11 +1016,11 @@
"postulas la ARMv6-arkitekturon. Ne eblas ĝisdatigi vian sistemon al nova "
"Ubuntu-eldono kun ĉi tiu aparataro."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Ne disponeblas 'init'"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1034,11 +1034,11 @@
"agordojn de via virtuala maŝino.\n"
"Ĉu vi vere volas daŭrigi?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE ne enŝaltita"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1769,11 +1769,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Elŝutaanta la ilon por eldonĝisdatigi"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Kontroli ĉu aktualigo al la plej nova disvolva eldono eblas"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1852,20 +1852,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Rulu 'do-release-upgrade' por ĝisdatigi al ĝi"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Ĝisdatigilo de programaroj"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ĝisdatigoj por Ubuntu %(version)s disponeblas"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Vi decidis ne ĝisdatigi al Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Aldoni eligon de sencimigo"
diff -Nru ubuntu-release-upgrader-17.04.7/po/es.po ubuntu-release-upgrader-17.10.1/po/es.po
--- ubuntu-release-upgrader-17.04.7/po/es.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/es.po 2017-04-24 21:05:20.000000000 +0000
@@ -18,12 +18,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: es\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor para %s"
@@ -31,20 +31,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidores personalizados"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "No se puede calcular la entrada en sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -52,11 +52,11 @@
"No se pudo localizar ningún paquete, quizá no es un disco de Ubuntu o no es "
"la arquitectura correcta."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Error al añadir el CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -71,13 +71,13 @@
"El mensaje de error fue:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Desinstalar paquete en mal estado"
msgstr[1] "Desinstalar paquetes en mal estado"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -98,15 +98,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "El servidor puede estar sobrecargado"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -115,7 +115,7 @@
"software. Repárelos primero mediante Synaptic o apt-get antes de continuar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,12 +133,12 @@
" * Paquetes no oficiales de software no proporcionados por Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Probablemente sea un problema transitorio, inténtelo de nuevo más tarde."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -146,15 +146,15 @@
"Si nada de esto aplica, informe de este error usando la orden «ubuntu-bug "
"ubuntu-release-upgrader-core» en una terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "No se ha podido calcular la actualización"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error al autenticar algunos paquetes"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -164,7 +164,7 @@
"problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una "
"lista de los paquetes no autenticados."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -172,22 +172,22 @@
"El paquete «%s» está marcado para desinstalarse pero está en la lista negra "
"de desinstalación."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "El paquete esencial «%s» ha sido marcado para su desinstalación."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Intentando instalar la versión prohibida «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "No se ha podido instalar «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -195,11 +195,11 @@
"Fue imposible instalar un paquete requerido. Informe de esto como un error "
"usando «ubuntu-bug ubuntu-release-upgrader-core» en una terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "No se ha podido determinar el metapaquete"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -529,7 +529,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculando los cambios"
@@ -551,7 +551,7 @@
"original. Puede reanudar la actualización posteriormente."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "No se han podido descargar las actualizaciones"
@@ -566,27 +566,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error durante la confirmación"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restaurando el estado original del sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "No se han podido instalar las actualizaciones"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -595,7 +595,7 @@
"estado no utilizable. Ahora se llevará a cabo una recuperación (dpkg --"
"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -612,7 +612,7 @@
"adjunte los archivos en /var/log/dist-upgrade/ al informe.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -620,20 +620,20 @@
"La actualización se ha cancelado. Compruebe su conexión a Internet o el "
"soporte de instalación y vuelva a intentarlo. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "¿Desinstalar los paquetes obsoletos?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Conservar"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Eliminar"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -643,28 +643,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "La dependencia requerida no está instalada"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dependencia requerida «%s» no está instalada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Comprobando el gestor de paquetes"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Falló la preparación de la actualización"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -672,7 +672,7 @@
"Falló la preparación del sistema para actualizarse, de manera que se ha "
"iniciado el proceso de informe de errores."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -680,13 +680,13 @@
"Falló al preparar el sistema para la actualización. Para informar de un "
"error instale apport y después ejecute «apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
"Ha fallado la obtención de los requisitos previos de la actualización"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -699,7 +699,7 @@
"\n"
"Adicionalmente, se está iniciando un proceso de notificación de errores."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -714,23 +714,23 @@
"Para informar de un error instale apport y después ejecute «apport-bug "
"ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Actualizando la información del repositorio"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Fallo al añadir el CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Lo sentimos, no se pudo añadir el CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Información sobre los paquetes no válida"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -749,40 +749,40 @@
"En caso de tratarse de una sobrecarga de la réplica, debe esperar para "
"reintentar la actualización más tarde."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Descargando"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Actualizando"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Actualización completada"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "La actualización se completó pero hubo errores durante el proceso."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Buscando paquetes obsoletos"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "La actualización del sistema se ha completado."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "La actualización parcial se ha completado."
@@ -811,17 +811,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autenticar «%(file)s» contra «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extrayendo «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "No se ha podido ejecutar la herramienta de actualización"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -829,29 +829,29 @@
"Lo más probable es que esto sea un error en la herramienta de actualización. "
"Informe de esto con la orden «ubuntu-bug ubuntu-release-upgrader-core»."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Firma de la herramienta de actualización"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Herramienta de actualización"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Error al descargar"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Ha fallado la descarga de la actualización. Puede haber un problema con la "
"red. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Error de autenticación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -859,11 +859,11 @@
"Ha fallado la autenticación de la actualización. Es posible que exista un "
"problema con la red o el servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Error al extraer"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -871,11 +871,11 @@
"Ha fallado la extracción de la actualización. Puede haber un problema con la "
"red o el servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Falló la verificación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -883,12 +883,12 @@
"Ha fallado la verificación de la actualización. Puede haber un problema con "
"la red o con el servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "No se ha podido ejecutar la actualización"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -897,7 +897,7 @@
"ejecutable. Vuelva a montarlo sin «noexec» y ejecute de nuevo la "
"actualización."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "El mensaje de error es «%s»"
@@ -1012,11 +1012,11 @@
"\n"
"¿Quiere continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Sin CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1028,11 +1028,11 @@
"como arquitectura mínima. No es posible actualizar su sistema a la nueva "
"versión de Ubuntu con este hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "No hay CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1044,11 +1044,11 @@
"requieren ARMv6 como arquitectura mínima. No es posible actualizar sus "
"sistema a la nueva versión de Ubuntu con este hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "El demonio init no está disponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1064,11 +1064,11 @@
"\n"
"¿Está seguro de que quiere continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE no activado"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1805,11 +1805,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Descargando la herramienta de actualización de la versión"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Comprobar si es posible actualizar a la última versión de desarrollo"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1888,20 +1888,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Ejecute «do-release-upgrade» para actualizarse a ella."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Actualización de software"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Está disponible la actualización a Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ha decidido no actualizarse a Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Añadir resultado de la depuración"
diff -Nru ubuntu-release-upgrader-17.04.7/po/et.po ubuntu-release-upgrader-17.10.1/po/et.po
--- ubuntu-release-upgrader-17.04.7/po/et.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/et.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: et\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server %s jaoks"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Põhiserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Kohandatud serverid"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Sources.list kirjet pole võimalik tõlgendada"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Ühtegi pakifaili ei leitud. Võib-olla ei ole see Ubuntu plaat või on valele "
"protsessoriarhitektuurile?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD lisamine nurjus"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Veateade oli:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Eemalda halvas seisus tarkvarapakett"
msgstr[1] "Eemalda halvas seisus tarkvarapaketid"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server võib olla ülekoormatud"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Katkised paketid"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"parandada. Palun paranda need synaptic'u või apt-get'i abil enne jätkamist."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -123,25 +123,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "See on üsna tõenäoliselt mööduv probleem, proovi hiljem uuesti."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Uuenduse arvutamine polnud võimalik"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Viga mõnede pakettide usaldusväärsuse kinnitamisel"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -151,7 +151,7 @@
"mööduv võrguprobleem, nii et võid hiljem uuesti proovida. All järgneb "
"kontrollimata pakettide nimekiri."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -159,32 +159,32 @@
"Eemaldamiseks on märgistatud pakett '%s', mis on aga eemaldamise mustas "
"nimekirjas."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Oluline pakett '%s' on märgistatud eemaldamiseks."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Halvas nimekirjas oleva versiooni '%s' paigaldamise katse"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Paketi '%s' paigaldamine pole võimalik"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Meta-paketi arvamine pole võimalik"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -479,7 +479,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Muudatuste rehkendamine"
@@ -501,7 +501,7 @@
"võid uuendada mõni teine kord."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Uuenduste allalaadimine polnud võimalik"
@@ -515,27 +515,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Toimingu ajal esines viga"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Süsteemi algse oleku taastamine"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Uuenduste paigaldamine polnud võimalik"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -543,7 +543,7 @@
"Uuendamine katkes. Sinu arvuti võib olla praegu kasutamatu. Praegu käivitati "
"taastamisoperatsioon (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -554,7 +554,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -562,20 +562,20 @@
"Uuendamine katkes. Kontrolli internetiühendust või paigaldusmeediumi ning "
"proovi uuesti. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Kas eemaldada iganenud paketid?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Hoia alles"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Eemalda"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -583,45 +583,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Vajalik sõltuvus pole paigaldatud"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Vajalik sõltuvus '%s' pole paigaldatud. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Paketihalduri kontrollimine"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Uuendamise ettevalmistamine ebaõnnestus"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Uuendamise eelduste hankimine ebaõnnestus"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -629,7 +629,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -638,23 +638,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Varamuinfo uuendamine"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Cdromi lisamine nurjus"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Kahjuks cdromi lisamine nurjus."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Vigane paketiinfo"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -666,40 +666,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Allalaadimine"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Uuendamine"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Uuendamine valmis"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Uuendus on lõpetatud, kuid uuendamise ajal tekkisid vead."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Aegunud tarkvara otsimine"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Süsteemi uuendamine on valmis."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Osaline uuendamine lõpetati."
@@ -728,54 +728,54 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Uuendamistööriista käivitamine polnud võimalik"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Uuendustööriista signatuur"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Uuendustööriist"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Allalaadimine ebaõnnestus"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Uuenduse allalaadimine ebaõnnestus. See võib olla võrguprobleem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autentimine ebaõnnestus"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"Uuenduse autentimine ebaõnnestus. See võib olla võrgu- või serveriprobleem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Lahtipakkimine ebaõnnestus"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -783,11 +783,11 @@
"Uuenduse lahtipakkimine ebaõnnestus. Võrgu või serveriga võib probleeme "
"olla. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Õigsuse kontroll nurjus"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -795,12 +795,12 @@
"Uuenduse ehtsuse kontroll ebaõnnestus. See võib olla võrgu- või "
"serveriprobleem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Uuendamist pole võimalik käivitada"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -808,7 +808,7 @@
"Tavaliselt põhjustab seda olukord, kui /tmp on haagitud lipuga noexec. Palun "
"uuesti haakida ilma noexec liputa ja taaskäivitada uuendus."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Veateade on '%s'."
@@ -862,7 +862,7 @@
#: ../DistUpgrade/DistUpgradeQuirks.py:183
msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
-msgstr ""
+msgstr "Teie graafika riistvara pole Ubuntu 14.04 täielikult toetatud."
#: ../DistUpgrade/DistUpgradeQuirks.py:185
msgid ""
@@ -908,11 +908,11 @@
"\n"
"Kas tahad sellest hoolimata jätkata?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Pole i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -924,11 +924,11 @@
"i686 arhitektuurile. Sellise riistvaraga ei ole võimalik süsteemi paigaldada "
"uut Ubuntu väljalaset."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ei leitud ARMv6 protsessorit"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -939,11 +939,11 @@
"Kõik paketid karmic'us koostati optimeeritult vähemalt ARMv6 arhitektuurile. "
"Selle raudvaraga ei ole võimalik Ubuntut uuendada."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Init pole saadaval"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -958,11 +958,11 @@
"\n"
"Kas tahad sellest hoolimata jätkata?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE pole lubatud"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1683,11 +1683,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Väljalaske uuendamise tööriista allalaadimine"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Kontrollib, kas viimasele arendusväljalaskele uuendamine on võimalik"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1765,20 +1765,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Sellele uuendamiseks käivita 'do-release-upgrade'."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
-msgstr ""
+msgstr "Tarkvara Uuendamishaldur"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s uuendus saadaval"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Sa keeldusid Ubuntu uuendamisest versioonile %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/eu.po ubuntu-release-upgrader-17.10.1/po/eu.po
--- ubuntu-release-upgrader-17.04.7/po/eu.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/eu.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: eu\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "'%s'(e)rako zerbitzaria"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Zerbitzari nagusia"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Zerbitzari pertsonalizatuak"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Ezin izan da sources.list sarrera kalkulatu"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Ezin izan da pakete-fitxategirik aurkitu, agian hau ez da Ubuntu disko bat "
"edo okerreko arkitekturarentzako da?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Huts egin du CDa gehitzeak"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Errorearen mezua:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Kendu egoera txarrean dagoen paketea"
msgstr[1] "Kendu egoera txarrean dauden paketeak"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Zerbitzaria gainkargatuta egon liteke"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"honekin. Lehenbailehen konpon itzazu synaptic edo apt-get erabiliz."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,12 +130,12 @@
" * Ubuntuk eskaintzen ez dituen software pakete ez-ofizialak\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Arazo iragankor bat izango da hau ziurrenik, saia zaitez berriro geroago."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Hauetako bat ere ez bada arrazoia, eman arazo honen berri terminal batean "
"'ubuntu-bug ubuntu-release-upgrader-core' agindua erabiliz."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Ezin izan da eguneraketa kalkulatu"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Errorea pakete batzuk egiaztatzerakoan"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,39 +161,39 @@
"daiteke. Saiatu berriro geroago. Begiratu azpian egiaztatu ezin izan diren "
"paketeen zerrenda."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Kentzeko markatuta dago '%s' paketea, baina kentze-zerrenda beltzan dago."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Kentzeko markatuta dago funtsezko '%s' paketea."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Zerrenda beltzeko '%s' bertsioa instalatzen saiatzen"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ezin da '%s' instalatu"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Ezin izan da meta-paketea zehaztu"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -515,7 +515,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Aldaketak kalkulatzen"
@@ -535,7 +535,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Ezin izan dira bertsio-berritzeak deskargatu"
@@ -547,27 +547,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Errorea egiaztapenean"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Sistemaren jatorrizko egoera berreskuratzen"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Ezin izan dira bertsio-berritzeak instalatu"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -576,7 +576,7 @@
"egoeran geldituko zen agian. Sistema berreskuratzen saiatuko gara oraintxe "
"bertan (dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -594,7 +594,7 @@
"txostenean.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -602,20 +602,20 @@
"Eguneraketa bertan behera gelditu da. Egiaztatu zure Internet konexioa edo "
"instalazioa egiteko erabili duzun euskarria eta saiatu berriro. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Zaharkitutako paketeak kendu?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Mantendu"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Kendu"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -625,34 +625,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Beharrezko mendekotasunen bat ez dago instalatua"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Beharrezko '%s' mendekotasuna ez dago instalatua. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Pakete-kudeatzailea egiaztatzen"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Huts egin du bertsio-berritzea prestatzeak"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -660,12 +660,12 @@
"Sistema bertsio-berritzerako prestatzeak huts egin du. Arazoaren berri "
"emateko, instalatu apport eta exekutatu 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Huts egin du bertsio-berritzerako aurrebaldintzak eskuratzeak"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -678,7 +678,7 @@
"\n"
"Gainera, arazoaren berri emateko prozesua abiaraziko da."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -693,23 +693,23 @@
"Arazoaren berri emateko, instalatu apport eta exekutatu 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Errepositorio-informazioa eguneratzen"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Errorea cdrom-a gehitzean"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Barkatu, cdrom-a gehitzea ez da arrakastatsua izan"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Pakete-informazio baliogabea"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -726,40 +726,40 @@
"/etc/apt/sources.list une honetan konfiguratutako software-jatorrien "
"zerrenda ezagutzeko."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Eskuratzen"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Bertsio-berritzen"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Bertsio-berritzea burututa"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Bertsio-berritzea burutu da, baina prozesuan erroreak egon dira."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Software zaharkitua bilatzen"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistemaren bertsio-berritzea burutu da."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Bertsio-berritze partziala burutu da."
@@ -788,17 +788,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "egiaztatu '%(file)s' '%(signature)s'(r)ekin "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' erauzten"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Ezin izan da bertsio-berritzeko tresna abiarazi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -806,29 +806,29 @@
"Ziurrenik hau bertsio-berritze tresnaren arazo bat da. Eman arazoaren berri "
"'ubuntu-bug ubuntu-release-upgrader-core' agindua erabiliz."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Bertsio-berritzeko tresnaren sinadura"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Bertsio-berritzeko tresna"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Errorea eskuratzean"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Ezin izan da bertsio-berritzea eskuratu. Sarearekin arazoren bat egon "
"liteke. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autentifikazioak huts egin du"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -836,11 +836,11 @@
"Ezin izan da bertsio-berritzea autentifikatu. Sarearekin edo "
"zerbitzariarekin arazoren bat egon liteke. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Erauzteak huts egin du"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -848,11 +848,11 @@
"Ezin izan da bertsio-berritzea erauzi. Sare edo zerbitzariarekin arazoren "
"bat egon liteke. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Egiaztapenak huts egin du"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -860,12 +860,12 @@
"Ezin izan da bertsio-berritzea egiaztatu. Sarearekin edo zerbitzariarekin "
"arazoren bat egon liteke. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Ezin da bertsio-berritzea abiarazi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -873,7 +873,7 @@
"Hau normalean /tmp noexec bezala muntatuta dagoen sistemetan gertatzen da. "
"Muntatu berriro noexec gabe eta exekutatu bertsio-berritzea berriz."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Hau da errorearen mezua: '%s'"
@@ -980,11 +980,11 @@
"\n"
"Jarraitu nahi duzu?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ez da i686 PUZa¡"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -995,11 +995,11 @@
"Pakete guztiak i686 behar duten optimizazioak eginez sortu dira. Ez da "
"posible zure sistema Ubuntu banaketa berrira eguneratzea."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ez dago ARMv6 PUZik"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1011,11 +1011,11 @@
"ziren. Ezin da sistema Ubunturen bertsio berri batera bertsio-berritu "
"hardware honekin."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Ez dago init-ik"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1031,11 +1031,11 @@
"\n"
"Ziur al zaude jarraitu nahi duzula?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE gaitu gabe"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1775,11 +1775,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Bertsio-berritzeko tresna deskargatzen"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Azken garapen-bertsiora eguneratzea posible den egiaztatu"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1858,20 +1858,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Exekutatu 'do-release-upgrade' bertsio-berritzeko."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Software-eguneratzailea"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s(r)en bertsio-berritzea eskuragarri"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ubuntu %s bertsio berria ezetsi duzu."
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Erroreak arazteko irteera-mezuak gehitu."
diff -Nru ubuntu-release-upgrader-17.04.7/po/fa.po ubuntu-release-upgrader-17.10.1/po/fa.po
--- ubuntu-release-upgrader-17.04.7/po/fa.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fa.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: fa\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "کارگزاران برای %s"
@@ -28,31 +28,31 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "کارگزار اصلی"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "کارگزاران سفارشی"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "مدخل sources.list محاسبه نشد"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
"هیچ بستهای پیدا نشد، شاید این لوح اوبونتو نیست و یا معماری آن متفاوت است."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -62,13 +62,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -85,22 +85,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -111,63 +111,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "بسته '%s' برای حذف علامتگذاری شده است اما در لیست سیاه حذفیات است."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "بسته حیاتی '%s' برای حذف علامتگذاری شده است."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -420,7 +420,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -440,7 +440,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -452,33 +452,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -489,26 +489,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -516,45 +516,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -562,7 +562,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -571,23 +571,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -599,40 +599,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -661,80 +661,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -828,11 +828,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -840,11 +840,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -852,11 +852,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -866,11 +866,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1547,11 +1547,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1619,20 +1619,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/fil.po ubuntu-release-upgrader-17.10.1/po/fil.po
--- ubuntu-release-upgrader-17.04.7/po/fil.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fil.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: fil\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Mga Server para sa %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Pangunahing server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Mga pasadyang server"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Hindi makalkula ang nakatala sa sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Walang paketeng natagpuan, maaaring hindi ito Ubuntu Disc o ang arkitektura "
"nito ay mali?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Hindi naidagdag ang CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Ang error message ay:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Alisin ang mga paketeng nasa masamang kalagayan"
msgstr[1] "Alisin ang mga package na masama ang lagay"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Baka sobrang kargado ang server"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Mga sirang package"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"get bago magpatuloy."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -124,27 +124,27 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Malamang sa malamang, ito ay isang mapaparam na suliraning. Mangyaring "
"pakisubukan muli mamaya."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Hindi makalkula ang upgrade"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "May problema sa pagkilala sa ibang mga package"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -154,7 +154,7 @@
"problema sa network. Maaari kayong sumubok muli mamaya. Ang mga sumusunod ay "
"ang mga package na hindi makilala."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -162,32 +162,32 @@
"Ang paketeng '%s' ay namarkahan upang matanggal ngunit ito ay na sa talaan "
"ng mga paketeng hindi maaaring tanggalin."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Ang mahalagang paketeng '%s' ay namarkahan upang matanggal."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Sinusubukang i-install ang naka-blacklist na bersyong '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Hindi ma-install ang '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Hindi mahulaan ang meta-package"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -462,7 +462,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Kinakalkula ang mga pagbabago"
@@ -484,7 +484,7 @@
"ay ibabalik. Ang upgrade ay maaari mong ituloy sa susunod."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Hindi ma-download ang mga upgrade"
@@ -496,33 +496,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error during commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Ibinabalik ang orihinal na kalagayan ng sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Hindi ma-install ang mga upgrade"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -533,26 +533,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Tanggalin ang mga lumang package?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Itago"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Tanggalin"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -562,45 +562,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Ang mga kinakailangang depend ay hindi naka-install"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Ang kinakailangang dependency '%s' ay hindi naka-intall. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Sinusuri ang package manager"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Nabigo sa paghahanda ng upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Nabigong kunin ang mga pangangailangan para sa pag-upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -608,7 +608,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -617,23 +617,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ina-update ang repository information"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Invalid package information"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -645,40 +645,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Kinukuha"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Nagu-upgrade"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Tapos na ang upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Naghahanap ng mga lumang software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Tapos na ang System upgrade."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Ang bahagyang upgrade ay tapos na."
@@ -707,43 +707,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Hindi matagpuan ang upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Upgrade tool signature"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Nabigo sa pagkuha"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Nabigo sa pagkuha ng upgrade. Marahil ay may problema sa network. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Nabigo ang authentication"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -751,11 +751,11 @@
"Nabigo ang authentication ng upgrade. Marahil ay may problema sa network o "
"sa server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Nabigo sa pag-extract"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -763,29 +763,29 @@
"Nabigo sa pag-extract ng upgrade. Marahil ay may problema sa network o sa "
"server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Nabigo ang verification. Marahil ay may problema sa network o sa server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Hindi mapatakbo ang upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Ang mensahe ng pagkakamali ay '%s'."
@@ -881,11 +881,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -893,11 +893,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -905,11 +905,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -919,11 +919,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1630,11 +1630,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Tignan kung ang pag-upgrade sa pinakabagong devel release ay maaari"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1702,20 +1702,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/fi.po ubuntu-release-upgrader-17.10.1/po/fi.po
--- ubuntu-release-upgrader-17.04.7/po/fi.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fi.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: fi\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Palvelin maalle %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Pääpalvelin"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Määrittele palvelin"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list-riviä ei voi laskea"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Pakettitiedostoja ei löytynyt. Käytettävä levy ei ehkä ole Ubuntu-levy tai "
"käyttöjärjestelmälaji voi olla väärä."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD-levyä ei voitu lisätä"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Virheilmoitus oli:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Poista huonossa tilassa oleva paketti"
msgstr[1] "Poista huonossa tilassa olevat paketit"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Palvelin saattaa olla ylikuormitettu"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Rikkinäisiä paketteja"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"jatkamista."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -131,11 +131,11 @@
" * Ubuntuun kuulumattomien, epävirallisten ohjelmapakettien käyttämisestä\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Tämä on luultavasti hetkellinen ongelma. Yritä myöhemmin uudelleen."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Jos mikään näistä ei päde, raportoi aiheesta virheraportti kirjoittamalla "
"päätteeseen seuraava komento:\"ubuntu-bug ubuntu-release-upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Tarvittavia päivitykseen liittyviä tarkistuksia ei voitu tehdä"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Joitain paketteja todennettaessa tapahtui virhe"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista "
"paketeista."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,22 +169,22 @@
"Paketti \"%s\" on merkitty poistettavaksi, mutta se on poistojen "
"estolistalla."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Pakollinen paketti \"%s\" on merkitty poistettavaksi."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Paketista yritetään asentaa mustalla listalla olevaa versiota \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ei voitu asentaa pakettia \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -192,11 +192,11 @@
"Vaaditun paketin asennus ei ollut mahdollista. Ilmoita tästä viasta "
"kirjoittamalla päätteeseen \"ubuntu-bug ubuntu-release-upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Metapakettia ei voitu arvata"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -521,7 +521,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Lasketaan muutoksia"
@@ -543,7 +543,7 @@
"päivitystä halutessasi myöhemmin."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Päivityksiä ei voitu noutaa"
@@ -557,27 +557,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Virhe suoritettaessa"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Palautetaan alkuperäistä järjestelmän tilaa"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Päivityksiä ei voitu asentaa"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -585,7 +585,7 @@
"Päivitys on keskeytynyt. Järjestelmä saattaa olla epävakaassa tilassa. "
"Palautuskomento suoritetaan nyt (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -603,7 +603,7 @@
"vikailmoitukseen.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -611,20 +611,20 @@
"Päivitys on keskeytynyt. Tarkista Internet-yhteytesi tai asennusmediasi ja "
"yritä uudelleen. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Poistetaanko vanhentuneet paketit?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Säilytä"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Poista"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -633,28 +633,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Vaadittuja riippuvuuksia ei ole asennettu"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Vaadittu riippuvuus \"%s\" ei ole asennettu. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Tarkistetaan pakettienhallintaa"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Päivityksen valmistelu epäonnistui"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -662,7 +662,7 @@
"Järjestelmän valmistelu versiopäivitystä varten epäonnistui, joten "
"vianilmoitusprosessi käynnistetään."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -671,12 +671,12 @@
"ongelmasta asentamalla apport ja suorittamalla komento \"apport-bug ubuntu-"
"release-upgrader\"."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Päivityksen esivaatimusten nouto epäonnistui"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -688,7 +688,7 @@
"\n"
"Virheraportointityökalu käynnistetään."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -703,23 +703,23 @@
"Tee vikailmoitus asentamalla apport ja suorittamalla komento \"apport-bug "
"ubuntu-release-upgrader\"."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Päivitetään ohjelmalähdetietoja"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "CD-levyn lisääminen ei onnistunut"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "CD-levyn lisääminen ei onnistunut"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Pakettitiedot viallisia"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -731,40 +731,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Noudetaan"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Päivitetään"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Päivitys on valmis"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Päivitys valmistui, mutta päivityksen yhteydessä tapahtui virheitä."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Etsitään vanhentuneita ohjelmistoja"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Järjestelmän päivitys on valmis."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Osittainen päivitys valmistui."
@@ -793,17 +793,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "todentaa '%(file)s' vastaan '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "puretaan \"%s\""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Päivitystyökalua ei voitu suorittaa"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -811,28 +811,28 @@
"Tämä johtuu todennäköisesti päivitysohjelmistossa olevasta ongelmasta. Tee "
"vikailmoitus komennolla \"ubuntu-bug ubuntu-release-upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Päivitystyökalun allekirjoitus"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Päivitystyökalu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Nouto epäonnistui"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Päivityksen noutaminen epäonnistui. Tämä voi johtua verkko-ongelmasta. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Todennus epäonnistui"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -840,11 +840,11 @@
"Päivityksen todennus epäonnistui. Tämä voi johtua ongelmasta "
"verkkoyhteydessä tai palvelimessa. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Purku epäonnistui"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -852,11 +852,11 @@
"Päivityksen purkaminen epäonnistui. Tämä voi johtua ongelmasta "
"verkkoyhteydessä tai palvelimessa. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Varmennus epäonnistui"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -864,12 +864,12 @@
"Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta "
"verkkoyhteydessä tai palvelimessa. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Päivitystä ei voi suorittaa"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -877,7 +877,7 @@
"Tämä johtuu yleensä siitä, että /tmp on liitetty noexec-valintaa käyttäen. "
"Liitä /tmp uudelleen ilman noexec-valintaa ja suorita päivitys uudelleen."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Virheviesti oli \"%s\"."
@@ -990,11 +990,11 @@
"\n"
"Haluatko jatkaa?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ei i686-suoritin"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1006,11 +1006,11 @@
"vähintään i686-suorittimen. Nykyistä laitteistoasi ei siis ole mahdollista "
"päivittää uudempaan Ubuntu-versioon."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ei ARMv6-suoritinta"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1022,11 +1022,11 @@
"vähintään ARMv6-arkkitehtuuria tukevan suorittimen. Tästä syystä "
"järjestelmäsi päivittäminen uuteen Ubuntun julkaisuun ei ole mahdollista."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Init-palvelua ei löydy"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1042,11 +1042,11 @@
"\n"
"Haluatko varmasti jatkaa?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE ei ole käytössä"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1780,11 +1780,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Noudetaan julkaisupäivitystyökalua"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Tarkista onko päivittäminen uusimpaan kehitysversioon mahdollista"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1863,20 +1863,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Aja \"do-release-upgrade\" päivittääksesi siihen."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Ohjelmistopäivitykset"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Päivitys versioon Ubuntu %(version)s on saatavilla"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Voit valita päivityksen Ubuntun versioon %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Lisää virheenjäljitystiedot"
diff -Nru ubuntu-release-upgrader-17.04.7/po/fo.po ubuntu-release-upgrader-17.10.1/po/fo.po
--- ubuntu-release-upgrader-17.04.7/po/fo.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fo.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: fo\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Ambætari fyri %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Høvuðs ambætari"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Ser ambætarar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Kundi ei útrokna keldulistanna skráseting"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Ikki før fyri at finna nakrar pakkfílur, møguliga er hettar ikki ein Ubuntu "
"fløga, ella skeivt byggilag?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Var ikki før fyri at leggja fløguna afturat"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Tak burtur pakkar í ringum standi"
msgstr[1] "Tak burtur pakka r í ringum standi"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -84,15 +84,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Ambætarin kann vera ovbyrðaður"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Brotnir pakkar"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -102,7 +102,7 @@
"heldur á."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -113,26 +113,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Hettar er helst ein bráfeingis trupulleiki, vinarliga royn aftur seinni."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Kundi ikki rokna út uppstiganinna"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Villa við at staðfesta summir pakkar"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -142,39 +142,39 @@
"farandi net trupulleiki. Tygum kunnu royna aftur seinni. Hygg niðanfyri "
"eftir einum lista við óstaðfestum pakkum."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Pakkin '%s' er merktur til burturtøku, men er á burturtøku svartalista."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Avgerðandi pakkin '%s' er merktur til burturtøku."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Royni at leggja inn svartlistaða útgávu '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ksnn ikki leggja inn '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Kann ikki gita meta-pakka"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -427,7 +427,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Rokni út broytingarnar"
@@ -447,7 +447,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Kundi ikki taka uppstigingarnar niður"
@@ -459,33 +459,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Endurstovni frum kervis stand"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Kundi ikki leggja inn uppstigingar"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -496,26 +496,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Varðveita"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Tak burtur"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -523,45 +523,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kanni pakka leiðara"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Fyrireiking av uppstigan miseydanðist"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -569,7 +569,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -578,23 +578,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -606,40 +606,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Uppstigi"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Uppstigan liðug"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Kervis uppstigan er liðug"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -668,80 +668,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -835,11 +835,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -859,11 +859,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -873,11 +873,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1552,11 +1552,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1624,20 +1624,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/fr_CA.po ubuntu-release-upgrader-17.10.1/po/fr_CA.po
--- ubuntu-release-upgrader-17.04.7/po/fr_CA.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fr_CA.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Serveur pour %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Serveur principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Serveurs personnalisés"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Imposible de calculer une entrée de sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Impossible de localiser les fichiers des paquets. Ceci n'est peut-être pas "
"un disque Ubuntu ou l'architecture est erronée."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Échec lors de l'ajout du CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Le message d'erreur était :\n"
"« %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Enlever le paquet en mauvais état"
msgstr[1] "Enlever les paquets en mauvais état"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Le serveur est peut-être surchargé"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquets brisés"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"continuer."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -132,11 +132,11 @@
" * des paquets logiciels non officiels, non fournis par Ubuntu.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ceci semble être un problème passager, veuillez ressayer plus tard."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -144,15 +144,15 @@
"Si rien de tout cela ne s'applique, veuillez rapporter ce bogue en utilisant "
"la commande « ubuntu-bug ubuntu-release-upgrader-core » dans un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Impossible de calculer la mise à niveau"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Erreur lors de l'authentification de certains paquets"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -162,7 +162,7 @@
"problème réseau passager. Vous pourriez ressayer plus tard. Voyez ci-dessous "
"une liste des paquets non authentifiés."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -170,23 +170,23 @@
"Le paquet « %s » est marqué pour suppression mais il est dans la liste "
"noire des suppressions."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Le paquet essentiel « %s » est marqué pour suppression."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Tentative d'installation de la version « %s » se trouvant dans la liste noire"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Impossible d'installer « %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -195,11 +195,11 @@
"comme bogue en utilisant « ubuntu-bug ubuntu-release-upgrader-core » dans un "
"terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Impossible de deviner le méta-paquet"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -534,7 +534,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calcul des changements"
@@ -556,7 +556,7 @@
"sera restauré. Vous pouvez reprendre la mise à niveau plus tard."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Impossible de télécharger les mises à niveau"
@@ -571,27 +571,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Erreur pendant la validation"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restauration de l'état original du système"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Impossible d'installer les mises à niveau"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -599,7 +599,7 @@
"La mise à niveau a été interrompue. Votre système pourrait être dans un état "
"inutilisable. Une récupération sera lancée maintenant (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -616,7 +616,7 @@
"joindre les fichiers dans /var/log/dist-upgrade/ au rapport de bogue.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -624,20 +624,20 @@
"La mise à niveau a été interrompue. Veuillez vérifier votre connexion "
"Internet ou le support d'installation et ressayer. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Enlever les paquets obsolètes?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Garder"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Enlever"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -647,28 +647,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Dépendance exigée non installée"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dépendance exigée « %s » n'est pas installée. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Vérification du gestionnaire de paquets"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Échec lors de la préparation de la mise à niveau"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -676,7 +676,7 @@
"La préparation du système pour la mise à niveau a échoué et un processus de "
"rapport de bogue est en cours."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -684,12 +684,12 @@
"La préparation du système pour la mise à niveau a échoué. Pour rapporter un "
"bogue, installez apport et exécutez « apport-bug ubuntu-release-upgrader »."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Échec lors de l'obtention des prérequis de la mise à niveau"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -701,7 +701,7 @@
"d'origine du système.\n"
"De plus, un processus de rapport de bogue est en cours."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -716,23 +716,23 @@
"Pour rapporter un bogue, installez apport et exécutez « apport-bug ubuntu-"
"release-upgrader »."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Mise à jour des informations sur les dépôts"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Échec lors de l'ajout du cédérom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Désolé, l'ajout du cédérom n'a pas réussi."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informations de paquets invalides"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -751,42 +751,42 @@
"Dans le cas d'un miroir surchargé, vous pourriez ressayer la mise à niveau "
"plus tard."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Récupération"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Mise à niveau"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Mise à niveau terminée"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"La mise à niveau est terminée, mais il y a eu des erreurs pendant le "
"processus de mise à niveau."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Recherche de logiciels obsolètes"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "La mise à niveau du système est terminée."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "La mise à niveau partielle est terminée."
@@ -815,17 +815,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "authentifier « %(file)s » avec « %(signature)s » "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extraction de « %s »"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Impossible d'exécuter l'outil de mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -834,29 +834,29 @@
"rapporter comme un bogue en utilisant la commande « ubuntu-bug ubuntu-"
"release-upgrader-core »."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signature de l'outil de mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Outil de mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Récupération impossible"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"La récupération de la mise à niveau à échoué. Il y a peut-être un problème "
"de réseau. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Échec lors de l'authentification"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -864,11 +864,11 @@
"L'authentification de la mise à niveau a échoué. Il y a peut-être un "
"problème avec le réseau ou avec le serveur. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Échec lors de l'extraction"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -876,11 +876,11 @@
"L'extraction de la mise à niveau a échoué. Il y a peut-être un problème avec "
"le réseau ou avec le serveur. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Échec lors de la vérification"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -888,12 +888,12 @@
"La vérification de la mise à niveau a échoué. Il y a peut-être un problème "
"avec le réseau ou avec le serveur. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Impossible d'exécuter la mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -901,7 +901,7 @@
"Ceci est habituellement causé par un système ou /tmp est monté noexec. "
"Veuillez remonter sans noexec et exécuter la mise à niveau à nouveau."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Le message d'erreur est « %s »."
@@ -1017,11 +1017,11 @@
"\n"
"Voulez-vous continuer?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Pas d'UCT i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1033,11 +1033,11 @@
"l'architecture minimale soit i686. Il est impossible de mettre à niveau "
"votre système vers une nouvelle version d'Ubuntu avec ce matériel."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Pas d'UCT ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1049,11 +1049,11 @@
"exigeant que l'architecture minimale soit ARMv6. Il est impossible de mettre "
"à niveau votre système vers une nouvelle version d'Ubuntu avec ce matériel."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Aucun init de disponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1069,11 +1069,11 @@
"\n"
"Voulez-vous vraiment poursuivre?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE n'est pas activée"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1816,13 +1816,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Téléchargement de l'outil de mise à niveau de version"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Vérifier s'il est possible de mettre à niveau vers la dernière version de "
"dév."
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1901,20 +1901,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Exécuter « do-release-upgrade » pour mettre à niveau."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Gestionnaire de mises à jour"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "La mise à niveau vers Ubuntu %(version)s est disponible"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Vous avez refusé la mise à niveau vers Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Ajouter la sortie de débogage"
diff -Nru ubuntu-release-upgrader-17.04.7/po/fr.po ubuntu-release-upgrader-17.10.1/po/fr.po
--- ubuntu-release-upgrader-17.04.7/po/fr.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fr.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: fr\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Serveur pour %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Serveur principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Serveurs personnalisés"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Impossible d'évaluer la ligne de source.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Impossible de localiser les fichiers des paquets. Ce n'est peut-être pas un "
"disque Ubuntu ou alors il est prévu pour une autre architecture."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Impossible d'ajouter le CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Le message d'erreur est :\n"
"« %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Supprimer le paquet endommagé"
msgstr[1] "Supprimer les paquets endommagés"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Le serveur est peut-être surchargé"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquets cassés"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"avant de continuer."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,12 +133,12 @@
" * des paquets logiciels non officiels, non fournis par Ubuntu.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Cela ressemble fort à un problème temporaire. Veuillez réessayer plus tard."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -146,15 +146,15 @@
"Si rien de tout cela ne s'applique, veuillez signaler ce bogue en utilisant "
"la commande « ubuntu-bug ubuntu-release-upgrader-core » dans un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Impossible d'évaluer la mise à niveau"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Erreur lors de l'authentification de certains paquets"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -165,7 +165,7 @@
"ultérieurement. Vous trouverez ci-dessous une liste des paquets non "
"authentifiés."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -173,22 +173,22 @@
"Le paquet « %s » est marqué pour suppression mais il est dans la liste noire "
"des suppressions."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Le paquet essentiel « %s » est marqué pour suppression."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Tentative d'installation de la version en liste noire « %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Impossible d'installer « %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -197,11 +197,11 @@
"bogue en utilisant la commande « ubuntu-bug ubuntu-release-upgrader-core » "
"dans un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Impossible de déterminer le méta-paquet"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -539,7 +539,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calcul des modifications en cours"
@@ -561,7 +561,7 @@
"restauré. Vous pouvez la reprendre plus tard."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Impossible de télécharger les mises à jour"
@@ -576,27 +576,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Erreur pendant la soumission"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restauration du système dans son état d'origine"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Impossible d'installer la mise à niveau"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -604,7 +604,7 @@
"La mise à niveau a échoué. Votre système pourrait être inutilisable. Une "
"tentative de récupération va maintenant avoir lieu (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -622,7 +622,7 @@
".\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -630,20 +630,20 @@
"La mise à niveau a échoué. Veuillez vérifier votre connexion Internet et le "
"support d'installation avant de réessayer. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Supprimer les paquets obsolètes ?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Conserver"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Supprimer"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -653,28 +653,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Dépendance nécessaire non installée"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dépendance nécessaire « %s » n'est pas installée. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Vérification du gestionnaire de paquets"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Échec lors de la préparation de la mise à niveau"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -682,7 +682,7 @@
"La préparation du système pour la mise à niveau a échoué. Un processus de "
"rapport d'incident est donc initialisé."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -691,12 +691,12 @@
"bogue, installer « apport » puis exécuter « apport-bug ubuntu-release-"
"upgrader »."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Impossible d'obtenir les pré-requis nécessaires à la mise à niveau"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -707,7 +707,7 @@
"mise à niveau va s'arrêter et restaurer le système dans son état initial.\n"
"En complément, un processus de rapport d'incident est initialisé."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -721,23 +721,23 @@
"Pour signaler un bogue, installer « apport » et exécuter « apport-bug ubuntu-"
"release-upgrader »."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Mise à jour des informations sur les dépôts"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Impossible d'ajouter le CD"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Désolé, l'ajout du CD a échoué."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informations sur les paquets non valables"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -756,42 +756,42 @@
"Dans le cas d'un miroir surchargé, vous pourrez de nouveau essayer la mise à "
"jour plus tard."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Récupération"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Mise à niveau"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Mise à niveau terminée"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"La mise à niveau est terminée, mais des erreurs se sont produites lors de ce "
"processus."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Recherche de logiciels obsolètes"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "La mise à niveau du système est terminée."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "La mise à niveau partielle est terminée."
@@ -820,17 +820,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "authentification de « %(file)s » avec « %(signature)s » "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extraction de '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Impossible de lancer l'outil de mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -839,29 +839,29 @@
"signaler comme un bogue en utilisant la commande « ubuntu-bug ubuntu-release-"
"upgrader-core »."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signature de l'outil de mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Outil de mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Récupération impossible"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"La récupération de la mise à niveau à échoué. Il y a peut-être un problème "
"de réseau. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Échec de l'authentification"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -869,11 +869,11 @@
"L'authentification de la mise à niveau a échoué. Il y a peut-être un "
"problème de réseau ou de serveur. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Extraction impossible"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -881,11 +881,11 @@
"L'extraction de la mise à niveau a échoué. Il y a peut-être un problème de "
"réseau ou de serveur. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "La vérification a échoué"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -893,12 +893,12 @@
"La vérification de la mise à niveau a échoué. Il y a peut-être un problème "
"de réseau ou de serveur. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Impossible de lancer la mise à niveau"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -906,7 +906,7 @@
"Ceci est habituellement dû a un système ou /tmp est monté en mode noexec. "
"Veuillez remonter sans l'option noexec et mettre à jour à nouveau."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Le message d'erreur est « %s »."
@@ -1024,11 +1024,11 @@
"\n"
"Voulez-vous continuer ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Pas de processeur i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1041,11 +1041,11 @@
"impossible de mettre à niveau votre système vers une nouvelle version "
"d'Ubuntu avec votre matériel actuel."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Pas de processeur ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1057,11 +1057,11 @@
"nécessitant au minimum une architecture ARMv6. Il est impossible de mettre à "
"niveau votre système vers la nouvelle version d'Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Initialisation indisponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1077,11 +1077,11 @@
"\n"
"Voulez-vous vraiment continuer ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE non activé"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1823,13 +1823,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Téléchargement de l'outil de mise à niveau de distribution"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Vérifier si la mise à niveau vers la dernière version de développement est "
"possible"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1909,20 +1909,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Lancer « do-release-upgrade » pour mettre à niveau vers celle-ci."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Gestionnaire de mises à jour"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Mise à niveau vers Ubuntu %(version)s disponible"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Vous avez refusé la mise à niveau vers Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Ajouter la sortie de débogage"
diff -Nru ubuntu-release-upgrader-17.04.7/po/fur.po ubuntu-release-upgrader-17.10.1/po/fur.po
--- ubuntu-release-upgrader-17.04.7/po/fur.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fur.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: fur\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidôr par %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidôr princpâl"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidôrs personalitâts"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "No pues calcolâ la vôs sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"No puedi cjatà nissun file dai pachets, forsit no isal un Disc Ubuntu o le "
"architeture sbaliade ?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "No rivât a zontà al CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Al messaç di erôr e jere:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Gjave il pacut ravuinât"
msgstr[1] "Gjave i pacuts ravuinâts"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Al servidôr pôl jessi sorecjariât"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "pacuts ravuinâts"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"comedilu cun synaptic o cun apt-get prime di la indenant"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -124,26 +124,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Chest al è a la plui un probleme momentani, riprove par plasè plui tart."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "No si pues calcolâ l'avançament"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Erôr tal autenticà un pôcs di pachets"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -153,39 +153,39 @@
"momentani probleme di ret. Pôl jessi che tu vuelis riprovà plui tart. Ciale "
"sote par une liste dai pachets no autenticâts."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Il pachet '%s' al è segnât di rimovilu ma al è ta liste nere di rimozion."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Il pachet indispensabil '%s' al è segnât pa rimozion."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Cirint di instalà la version '%s' in liste nere"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "No si pues instalâ '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -439,7 +439,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Daûr a calcolâ i cambiaments"
@@ -459,7 +459,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "No si pues discjamâ i inzornaments"
@@ -471,33 +471,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Daûr a tornâ al stât origjinâl dal sisteme"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "No si pues instalâ i inzornaments"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -508,26 +508,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Vuelistu gjavâ i pacuts vecjos?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Ten"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Gjave"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -535,45 +535,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Lis dipendencis necessaris no son instaladis"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dipendence necessarie '%s' no je instalade. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Daûr a controlâ il gjestôr di pacuts"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparazion dal avançament di version falide"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -581,7 +581,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -590,23 +590,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Daûr a inzornâ lis informazions dal dipuesit"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informazions di pacut no validis"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -618,40 +618,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Daûr a recuperâ"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Daûr a inzornâ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Avançament di version finît"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Avançament di version dal sistem finît."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -680,80 +680,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Imprest pal inzornament"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autenticazion falide"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -847,11 +847,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -859,11 +859,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -871,11 +871,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -885,11 +885,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1569,11 +1569,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1641,20 +1641,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/fy.po ubuntu-release-upgrader-17.10.1/po/fy.po
--- ubuntu-release-upgrader-17.04.7/po/fy.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/fy.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Tsjinner foar %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Haadtsjinner"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Oanpaste tsjinners"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Koe sources.list ynfier net berekkenje"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Koe gjin pakket-triemen fine, miskien is dit gjin Ubuntu skiif of de "
"ferkearde arsjitektuer?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Tafoegjen fan de skiif mislearre"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"It flater berjocht wie:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Pakket yn minne tastân fuortsmite."
msgstr[1] "Pakketten yn minne tastân fuortsmite."
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -94,22 +94,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "De tsjinner kin oerbelêstige wêze"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Brutsen pakketten"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -120,32 +120,32 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Dit is wierskynlik"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Koe de opwurdearing net berekkenje"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Flater bei it bepalen fan de echtheid fan sommige pakketten"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -153,32 +153,32 @@
"It pakket '%s' is markearre foar ferwiderje, mar it stjit op de swarte list "
"foar ferwiderje."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "It nedige pakket '%s' is markearre foar ferwiderjen."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Kin '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Kin it meta-pakket net riede"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -429,7 +429,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -449,7 +449,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -461,33 +461,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -498,26 +498,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -525,45 +525,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -571,7 +571,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -580,23 +580,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -608,40 +608,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -670,80 +670,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -837,11 +837,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -849,11 +849,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -861,11 +861,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -875,11 +875,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1554,11 +1554,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1626,19 +1626,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ga.po ubuntu-release-upgrader-17.10.1/po/ga.po
--- ubuntu-release-upgrader-17.04.7/po/ga.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ga.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ga\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pacáistí Briste"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/gd.po ubuntu-release-upgrader-17.10.1/po/gd.po
--- ubuntu-release-upgrader-17.04.7/po/gd.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/gd.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
"(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Am frithealaiche airson %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Prìomh fhrithealaiche"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Frithealaichean gnàthaichte"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Cha b' urrainn dhuinn an t-innteart sources.list àireamhachadh"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Cha b' urrainn dhuinn faidhlichean pacaid sam bith a lorg. 'S mathaid nach e "
"diosga Ubuntu a tha seo gu bheil no an ailtearachd cearr?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Cha b' urrainn dhuinn a chur ris an CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,7 +69,7 @@
"Seo teachdaireachd na mearachd:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Tha a' phacaid a bheir air falbh e ann an droch-staid"
@@ -77,7 +77,7 @@
msgstr[2] "Tha na pacaidean a bheir air falbh e ann an droch-staid"
msgstr[3] "Tha na pacaidean a bheir air falbh e ann an droch-staid"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -106,15 +106,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Dh'fhaoidte gu bheil cus uallach air an fhrithealaiche"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pacaidean briste"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -124,7 +124,7 @@
"synaptic no apt-get mus lean thu air adhart."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -144,13 +144,13 @@
"Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Tha deagh-theans nach mair an duilgheadas seo. Feuch ris a-rithist an ceann "
"greis."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -158,15 +158,15 @@
"Mur eil gin dhiubh seo iomchaidh, nach dèan thu aithris air a' bhuga seo "
"leis an àithne \"ubuntu-bug ubuntu-release-upgrader-core\" ann an tèirmineal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Cha b' urrainn dhuinn an t-àrdachadh àireamhachadh"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Thachair mearachd rè dearbhadh cuid a phacaidean"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -176,7 +176,7 @@
"duilgheadas sealach leis an lìonra a tha seo. Nach fheuch thu ris a-rithist "
"an ceann greis? Tha liosta nam pacaidean nach deach an dearbhadh gu h-ìosal."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -184,25 +184,25 @@
"Tha comharra ris a' phacaid \"%s\" a dh'innseas gu bheil e ri thoirt air "
"falbh ach tha e air dubh-liosta nan rudan a tha ri an toirt air falbh."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
"Tha comharra ris a' phacaid \"%s\" a dh'innseas gu bheil e ri thoirt air "
"falbh ach 's e pacaid riatanach a tha ann."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"A' feuchainn ris an tionndadh \"%s\" a stàladh a tha air an dubh-liosta"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Cha ghabh \"%s\" a stàladh"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -211,11 +211,11 @@
"dèan thu aithris air a' bhuga seo leis an àithne \"ubuntu-bug ubuntu-release-"
"upgrader-core\" ann an tèirmineal?"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Chan urrainn dhuinn am meta-package a thomhas"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -560,7 +560,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Ag àireamhachadh nan atharraichean"
@@ -582,7 +582,7 @@
"siostaim aiseag. 'S urrainn dhut leantainn air an àrdachadh uaireigin eile."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Cha b' urrainn dhuinn na h-àrdachaidhean a luchdadh a-nuas"
@@ -597,27 +597,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Thachair mearachd rè a' commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Ag aiseag staid thùsail an t-siostaim"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Cha b' urrainn dhuinn na h-àrdachaidhean a stàladh"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -626,7 +626,7 @@
"nach gabh a chleachdadh. Cuiridh sinn gu dol gleus aisig an-dràsta (dpkg --"
"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -643,7 +643,7 @@
"cuir na faidhlichean ann an /var/log/dist-upgrade/ ri aithris a' bhuga.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -651,22 +651,22 @@
"Sguireadh dhen àrdachadh. Thoir sùil air a' cheangal agad ris an eadar-lìon "
"no air a' mheadhan stàladh is feuch ris a-rithist. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
"A bheil thu airson na pacaidean air nach eil feum tuilleadh a thoirt air "
"falbh?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Cum iad"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Thoir air falbh iad"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -676,28 +676,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Tha eisimeileachdan ann air a bheil feum ach nach eil stàlaichte"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Chan eil an eisimeileachd \"%s\" stàlaichte ach tha feum air. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "A' sgrùdadh manaidsear nam pacaidean"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Dh'fhàillig an t-àrdachadh"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -705,7 +705,7 @@
"Dh'fhàgail ullachadh an t-siostam airson leasachadh agus tha sinn a' "
"tòiseachadh air aithris buga ri linn sin."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -714,12 +714,12 @@
"buga a chur thugainn, stàlaich apport 's an uairsin ruith \"apport-bug "
"ubuntu-release-upgrader\"."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Dh'fhairtlich oirnn ro-ghoireasan an àrdachaidh fhaighinn"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -732,7 +732,7 @@
"\n"
"A bharrachd air sin, tha sinn a' tòiseachadh air aithris buga."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -747,23 +747,23 @@
"Gus aithris air buga a chur thugainn, stàlaich apport 's an uairsin ruith "
"\"apport-bug ubuntu-release-upgrader\"."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ag ùrachadh fiosrachadh a' repository"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Cha b' urrainn dhuinn an cdrom a chur ris"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Tha sinn duilich ach cha b' urrainn dhuinn an cdrom a chur ris."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Tha fiosrachadh na pacaid mì-dhligheach"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -782,40 +782,40 @@
"Ma tha cus dhaoine a' cleachdadh an sgàthain an-dràsta, feuch ris an "
"àrdachadh a-rithist an ceann greis."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "'Ga fhaighinn"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "'Ga àrdachadh"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Tha an t-àrdachadh deiseil"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Tha an t-àrdachadh deiseil ach thachair mearachdan rè an àrdachaidh."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "A' lorg bathar-bog air nach eil feum tuilleadh"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Tha àrdachadh an t-siostaim a choileanadh."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Chaidh an t-àrdachadh pàirteach a choileanadh."
@@ -844,17 +844,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "dearbh \"%(file)s\" ri \"%(signature)s\" "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "ag às-tharraing \"%s\""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Cha b' urrainn dhuinn gleus an àrdachaidh a ruith"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -862,29 +862,29 @@
"Tha teans gur e buga sa ghleus àrdachaidh a tha seo. Nach dèan thu aithris "
"air a' bhuga seo leis an àithne \"ubuntu-bug ubuntu-release-upgrader-core\"."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Àrdaich soidhneadh gleus an àrdachaidh"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Gleus an àrdachaidh"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Cha b' urrainn dhuinn fhaighinn"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Cha b' urrainn dhuinn fhaighinn. Dh'fhaoidte gu bheil duilgheadas ann leis "
"an lìonra. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Dh'fhàillig an dearbhadh"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -892,11 +892,11 @@
"Dh'fhàillig an dearbhadh. Dh'fhaoidte gu bheil duilgheadas ann leis an "
"lìonra no leis an fhrithealaiche. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Cha b' urrainn dhuinn às-tharraing"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -904,11 +904,11 @@
"Cha b' urrainn dhuinn às-tharraing. Dh'fhaoidte gu bheil duilgheadas ann "
"leis an lìonra no leis an fhrithealaiche. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Dh'fhàillig an dearbhadh"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -916,12 +916,12 @@
"Dh'fhàillig an dearbhadh. Dh'fhaoidte gu bheil duilgheadas ann leis an "
"lìonra no leis an fhrithealaiche. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Chan urrainn àrdachadh"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -929,7 +929,7 @@
"Tachraidh sin air siostam air an deach /tmp a mhunntachadh mar noexec mar is "
"trice. Munntaich e as ùr as aonais noexec is feuch an t-àrdachadh a-rithist."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "'S e \"%s\" teachdaireachd na mearachd."
@@ -1046,11 +1046,11 @@
"\n"
"A bheil thu airson leantainn air adhart?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "As aonais CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1062,11 +1062,11 @@
"feumach air i686 air a' char as lugha. Chan urrainn dhut an siostam agad "
"àrdachadh gu tionndadh Ubuntu ùr leis a' bhathar-chruaidh seo."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "As aonais CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1078,11 +1078,11 @@
"a tha feumach air ARMv6 air a' char as lugha. Chan urrainn dhut an siostam "
"agad àrdachadh gu tionndadh Ubuntu ùr leis a' bhathar-chruaidh seo."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Chan eil init ri làimh"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1098,11 +1098,11 @@
"\n"
"A bheil thu cinnteach gu bheil thu airson leantainn air adhart?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "Chan eil PAE an comas"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1865,13 +1865,13 @@
msgid "Downloading the release upgrade tool"
msgstr "A' luchdadh a-nuas inneal àrdachadh an sgaoilidh"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Thoir sùil an urrainn dhomh àrdachadh gun sgaoileadh luchd-leasachaidh as "
"ùire"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1951,20 +1951,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Ruith \"do-release-upgrade\" gus àrdachadh thuige."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Ùraichear a' bhathair-bhog"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Tha àrdachadh gu Ubuntu %(version)s ri fhaighinn"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Chuir thu romhad an t-àrdachadh gu Ubuntu %s a dhiùltadh"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Cuir ris às-chur dì-bhugachaidh"
diff -Nru ubuntu-release-upgrader-17.04.7/po/gl.po ubuntu-release-upgrader-17.10.1/po/gl.po
--- ubuntu-release-upgrader-17.04.7/po/gl.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/gl.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor situado en %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidores personalizados"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Non e posíbel calcular a entrada do sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"Non é posíbel localizar ningún ficheiro de paquete; se cadra este non é un "
"disco de Ubuntu ou a arquitectura non é a correcta."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Non foi posíbel engadir o CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,13 +70,13 @@
"A mensaxe de erro foi:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Retirar o paquete en mal estado"
msgstr[1] "Retirar os paquetes en mal estado"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -97,15 +97,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "O servidor quizais estea saturado"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -115,7 +115,7 @@
"continuar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,11 +133,11 @@
" * Paquetes de software non oficiais e non fornecidos por Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Trátase, o máis seguro, dun problema temporal. Ténteo máis tarde."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -145,15 +145,15 @@
"Se ningún destes se pode aplicar, informe de este erro usando a orde «ubuntu-"
"bug ubuntu-release-upgrade-core» no seu terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Non foi posíbel calcular a anovación"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Produciuse un erro ao autenticar algúns paquetes"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -163,7 +163,7 @@
"problema transitorio na rede. Probe de novo máis tarde. Vexa abaixo unha "
"lista dos paquetes non autenticados."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -171,22 +171,22 @@
"O paquete «%s» está marcado para a súa eliminación pero está na lista negra "
"de paquetes eliminábeis."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "O paquete esencial «%s» está marcado para a súa eliminación"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Tentando instalar a versión da lista negra «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Non foi posíbel instalar «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -194,11 +194,11 @@
"Non foi posíbel instalar un paquete requirido. Informe deste erro usando "
"«ubuntu-bug ubuntu-release-upgrade-core» no seu terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Non foi posíbel determinar o meta-paquete"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -526,7 +526,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculando os cambios"
@@ -548,7 +548,7 @@
"Pode retomar a actualización máis adiante."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Non se puideron descargar as anovacións"
@@ -562,27 +562,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Produciuse un erro durante a remisión"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restaurando o estado orixinal do sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Non se puideron instalar as anovacións"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -590,7 +590,7 @@
"Abortouse a anovación. O seu sistema pode estar nun estado non utilizábel. "
"Vaise executar agora a recuperación (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -607,7 +607,7 @@
"anexe os ficheiros existentes en /var/log/dist-upgrade/ ao informe do erro.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -615,20 +615,20 @@
"Cancelouse a actualización. Comprobe a súa conexión a Internet ou o "
"dispositivo de instalación e volva a tentalo. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Retirar os paquetes obsoletos?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Conservar"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Retirar"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -638,28 +638,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Non está instalado depends, que é necesario"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "A dependencia requirida «%s» non está instalada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Comprobando o xestor de paquetes"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Fallou a preparación da anovación"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -667,7 +667,7 @@
"Produciuse un fallo ao preparar o sistema para a anovación polo que estase "
"iniciando un proceso de informe de erro."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -675,12 +675,12 @@
"Preparando o sistema para a anovación fallida. Para informar dun erro "
"instale apport e execute «apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Fallou a preparación da anovación"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -692,7 +692,7 @@
"\n"
"Ademais, estase iniciando un proceso de informe de erro."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -706,23 +706,23 @@
"Para informar dun fallo instale apport e execute «apport-bug ubuntu-release-"
"upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Actualizando a información do repositorio"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Produciuse un fallo ao engadir o CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Sentímolo, non foi posíbel engadir o CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Información de paquete incorrecta"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -741,41 +741,41 @@
"No caso de que sexa por mor dunha réplica saturada, debería anovar un pouco "
"máis tarde."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Obtendo"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Anovando"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Completouse a anovación"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"A actualización completouse mais producíronse erros durante o proceso."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Buscando paquetes obsoletos"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Completouse a anovación do sistema."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Completouse a anovación parcial do sistema."
@@ -804,17 +804,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autenticar «%(file)s» contra «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "a extraer «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Non foi posíbel executar a ferramenta de anovación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -822,27 +822,27 @@
"Isto semella ser un erro na ferramenta de anovación. Informe deste erro "
"usando a orde «ubuntu-bug ubuntu-release-upgrader-core»."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Sinatura da ferramenta de anovación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Ferramenta de anovación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Erro ao obter"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Fallou a obtención da anovación. Pode haber un problema coa rede. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Fallou a autenticación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -850,11 +850,11 @@
"Fallou a autenticación da anovación. Pode haber un problema coa rede ou co "
"servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Erro ao extraer"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -862,11 +862,11 @@
"Fallou a extracción da anovación. Pode haber un problema coa rede ou co "
"servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Fallou a verificación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -874,12 +874,12 @@
"Fallou a verificación da anovación. Pode haber un problema coa rede ou co "
"servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Non foi posíbel executar a anovación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -888,7 +888,7 @@
"«noexec». Remónte a partición sen o parámetro noexec antes de realizar a "
"anovación."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "A mensaxe do erro é «%s»."
@@ -1002,11 +1002,11 @@
"\n"
"Está seguro de que desexa continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Non é unha CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1018,11 +1018,11 @@
"arquitectura mínima. Non é posíbel actualizar o seu sistema á nova versión "
"de Ubuntu con este hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Non é unha CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1034,11 +1034,11 @@
"require ARMv6 como arquitectura mínima. Non é posíbel anovar o seu sistema a "
"unha versión de Ubuntu con esta arquitectura."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "O «daemon» init non está dispoñíbel"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1054,11 +1054,11 @@
"\n"
"Está seguro de que desexa continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "A PAE non está activada"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1786,12 +1786,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Descargando a ferramenta de anovación"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Comprobar se resulta posíbel anovar á versión en desenvolvemento máis recente"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1869,20 +1869,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Execute «do-release-upgrade» para anovarse."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Actualizador de software"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Está dispoñíbel unha anovación á %(version)s de Ubuntu"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Vostede rexeitou a anovación a Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Engadir a saída de depuración"
diff -Nru ubuntu-release-upgrader-17.04.7/po/gu.po ubuntu-release-upgrader-17.10.1/po/gu.po
--- ubuntu-release-upgrader-17.04.7/po/gu.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/gu.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: gu\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s નુ સર્વર"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "મુખ્ય સર્વર"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "અન્ય સર્વરો"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "ખરાબ હાલતમાં હોય તેવું પેકેજ કાઢી નાખો"
msgstr[1] "ખરાબ હાલતમાં હોય તેવા પેકેજ કાઢી નાખો"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,15 +82,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "તુટેલા પેકેજ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -99,7 +99,7 @@
"આગળ વધતા પહેલા તેમને સિનેપ્ટીક અથવા એપ્ટ-ગેટ વડે ઠીક કરી લો."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -110,63 +110,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -417,7 +417,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -437,7 +437,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -449,33 +449,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -486,26 +486,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -513,45 +513,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -559,7 +559,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -568,23 +568,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -596,40 +596,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -658,80 +658,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -825,11 +825,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -837,11 +837,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -849,11 +849,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -863,11 +863,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1542,11 +1542,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1614,20 +1614,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/gv.po ubuntu-release-upgrader-17.10.1/po/gv.po
--- ubuntu-release-upgrader-17.04.7/po/gv.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/gv.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: gv\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Serveryn son %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Server cadjin"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "serveryn lesh reihghyn"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Cha noddym co`earroodaghey enmys rolley.bunneyn"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Cha noddym feddyn coadanyn bundeilyn er chor erbee, foddee cha nel shoh ny "
"disk Ubuntu ny fodee cha nel yn troggal kiart echey?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Cha doddym cur er CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -84,22 +84,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -110,63 +110,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -417,7 +417,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -437,7 +437,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -449,33 +449,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -486,26 +486,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -513,45 +513,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -559,7 +559,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -568,23 +568,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -596,40 +596,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -658,80 +658,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -825,11 +825,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -837,11 +837,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -849,11 +849,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -863,11 +863,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1542,11 +1542,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1614,19 +1614,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/he.po ubuntu-release-upgrader-17.10.1/po/he.po
--- ubuntu-release-upgrader-17.04.7/po/he.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/he.po 2017-04-24 21:05:20.000000000 +0000
@@ -18,12 +18,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: he\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "שרת עבור %s"
@@ -31,20 +31,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "השרת הראשי"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "שרתים מותאמים"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "לא ניתן לחשב את הרשומה בקובץ sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -52,11 +52,11 @@
"לא ניתן לאתר כלל קובצי חבילות, היתכן שזהו אינו התקליטור של אובונטו או "
"שהארכיטקטורה שגויה?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "הוספת התקליטור נכשלה"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -71,13 +71,13 @@
"הודעת השגיאה הייתה:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "הסרת חבילה במצב רע"
msgstr[1] "הסרת חבילות במצב רע"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "יתכן שהשרת נתון תחת עומס יתר"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "חבילות פגומות"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"synaptic או apt-get לפני המשך התהליך."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -131,11 +131,11 @@
" * חבילות תכנה בלתי רשמיות שלא סופקו על ידי אובונטו.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "כנראה שזוהי בעיה זמנית, נא לנסות שוב מאוחר יותר."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"אם אף אחד מאלה לא חל, נא לדווח על כך כתקלה באמצעות הפקודה 'ubuntu-bug ubuntu-"
"release-upgrader-core' במסוף."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "לא ניתן לחשב את השדרוג"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "שגיאה באימות חלק מהחבילות"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -160,28 +160,28 @@
"לא ניתן היה לאמת מספר חבילות. יתכן כי מדובר בבעיית רשת זמנית. ניתן לנסות שוב "
"במועד מאוחר יותר. רשימת החבילות שלא אומתו מופיעה להלן."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "החבילה '%s' מסומנת להסרה אך חבילה זו נמצאת ברשימה הצנזורה להסרות."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "החבילה החיונית '%s' מסומנת להסרה."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "מתבצע ניסיון להתקנת גרסה מצונזרת '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "לא ניתן להתקין את '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -189,11 +189,11 @@
"פעולת התקנת החבילה הנדרשת התגלתה כבלתי אפשרית. נא לדווח על כך כתקלה באמצעות "
"הפקודה 'ubuntu-bug ubuntu-release-upgrader-core' במסוף."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "לא ניתן לזהות מהי חבילת העל"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -502,7 +502,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "השינויים מחושבים"
@@ -524,7 +524,7 @@
"מאוחר יותר."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "לא ניתן להוריד את השדרוג"
@@ -538,27 +538,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "שגיאה במהלך הביצוע"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "המערכת מוחזרת למצבה המקורי"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "לא ניתן להתקין את השדרוגים"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -566,7 +566,7 @@
"השדרוג בוטל. המערכת שלך עלולה להיות בלתי שמישה. כעת תתבצע פעולת שחזור (dpkg -"
"-configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -583,27 +583,27 @@
"ולצרף את הקבצים שתחת /var/log/dist-upgrade/ לדיווח על התקלה.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
"השדרוג בוטל. נא לבדוק את החיבור לאינטרנט ואת אמצעי ההתקנה ולנסות שוב. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "האם להסיר חבילות מיושנות?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_שמירה"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "ה_סרה"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -611,34 +611,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "החבילות הדרושות להתקנה אינן מותקנות"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "החבילה '%s' הדרושה להתקנה אינה מותקנת "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "מנהל החבילות נבדק"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "תהליך הכנת השדרוג נכשל"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "תהליך הכנת המערכת לשדרוג נכשל ולכן יופעל תהליך דיווח על תקלה."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -646,12 +646,12 @@
"הכנת המערכת לשדרוג נכשלה. כדי לדווח על תקלה יש להתקין את apport ואז להריץ את "
"הפקודה 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "קבלת דרישות הקדם לשדרוג נכשלה"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -663,7 +663,7 @@
"\n"
"בנוסף על כך, יופעל תהליך הדיווח על תקלות."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -677,23 +677,23 @@
"כדי לדווח על תקלה יש להתקין את apport ואז להריץ את הפקודה 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "נתוני המאגרים מתעדכנים"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "אירע כשל בהוספת כונן התקליטורים"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "הוספת התקליטור לא הצליחה, עמך הסליחה"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "פרטי החבילה אינם תקינים"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -705,40 +705,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "מתקבל"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "בשדרוג"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "השדרוג הושלם"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "השדרוג הושלם אך צצו שגיאות במהלך השדרוג."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "מתבצע חיפוש אחר תכנה מיושנת"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "שדרוג המערכת הושלם."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "השדרוג החלקי הושלם."
@@ -767,17 +767,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "אימות '%(file)s' כנגד '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' מחולץ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "לא ניתן להפעיל את כלי השדרוג"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -785,58 +785,58 @@
"זו היא כפי הנראה תקלה בכלי השדרוג. נא לדווח על כך כתקלה באמצעות הפקודה "
"'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "חותמת כלי השדרוג"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "כלי השדרוג"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "ההורדה נכשלה"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "הורדת השדרוג נכשלה. יתכן שישנה תקלה ברשת. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "האימות נכשל"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "אימות השדרוג נכשל. יתכן שישנה בעיה ברשת או בשרת. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "החילוץ נכשל"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "חילוץ השדרוג נכשל. עלולה להיות בעיה עם הרשת או השרת. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "האימות נכשל"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "אימות השדרוג נכשל. יתכן שישנה תקלה ברשת או בשרת. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "לא ניתן לבצע את השדרוג"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -844,7 +844,7 @@
"תקלה זו נגרמת לרוב כאשר במערכת התיקייה /tmp מוגדרת כ־noexec. נא לעגון שוב "
"ללא noexec ולהריץ את השדרוג פעם נוספת."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "הודעת השגיאה היא '%s'."
@@ -955,11 +955,11 @@
"\n"
"האם ברצונך להמשיך?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "המעבד אינו מסוג i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -970,11 +970,11 @@
"החבילות נבנו עם שיפורים הדורשים לכל הפחות את האכיטקטורה i686. לא ניתן לשדרג "
"את המערכת שלך להפצה חדשה יותר של אובונטו עם חומרה זו."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "אין מעבד מסוג ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -985,11 +985,11 @@
"החבילות ב־Karmic נבנו עם שיפורים מיוחדים הדורשים את ARMv6 כארכיטקטורה "
"מינימלית. לא ניתן לשדרג את המערכת להפצת אובונטו חדשה עם חומרה זו."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "אין init זמין"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1004,11 +1004,11 @@
"\n"
"האם ברצונך להמשיך?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE לא מופעל"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1729,11 +1729,11 @@
msgid "Downloading the release upgrade tool"
msgstr "מתבצעת הורדת כלי שדרוג ההפצה"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "יש לבדוק האם שדרוג לגרסת הפיתוח העדכנית ביותר אפשרי"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "מתבצע ניסיון לשדרג להפצה האחרונה בעזרת המעדכן מ־$distro-proposed"
@@ -1808,20 +1808,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "יש להריץ את הפקודה 'do-release-upgrade' כדי לשדרג אליה."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "מעדכן התכנה"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "שדרוג לאובונטו %(version)s זמין כעת"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "דחית את השדרוג לגרסה %s של אובונטו"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "הוספת פלט לניפוי שגיאות"
diff -Nru ubuntu-release-upgrader-17.04.7/po/hi.po ubuntu-release-upgrader-17.10.1/po/hi.po
--- ubuntu-release-upgrader-17.04.7/po/hi.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/hi.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: hi\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s का सर्वर"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "मुख्य सर्वर"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "विनिर्मित सर्वर"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list प्रविष्टि क़ी गणना नहीँ हो सकी"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"पैकेज संचिकाएँ नहीं मिलीं, संभवत: यह उबुंतू डिस्क नहीं है या स्थापत्य "
"अनुपयुक्त है."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "सी.डी. योजन असफल रहा."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,13 +67,13 @@
"त्रुटि संदेश था:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "अवांछित स्थिति के पैकेज हटाएँ."
msgstr[1] "अवांछित पैकेजों को हटाएँ"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -94,15 +94,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "हो सकता है की सर्वर अतिभारित है"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "अवांछित पैकेज"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -111,7 +111,7 @@
"है | कृपया उन्हें आगे बढ़ने से पहले सिनेपटिक या apt-get के साथ ठीक करे |"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -122,26 +122,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"बहुत सम्भव है कि यह अस्थायी समस्या है, कृपया बाद में पुनः प्रयास करें |"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "नवीनीकरण की गणना नहीं की जा सकी"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "कुछ पैकेज के सत्यापन में त्रुटि"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -151,7 +151,7 @@
"अस्थायी समस्या हो सकता है | आप बाद में पुनः प्रयास कर सकते है | प्रमाणित "
"पैकेज सूची के लिए नीचे देखें |"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -159,32 +159,32 @@
"पैकेज '%s' को हटाने के लिए चिह्नित किया गया है लेकिन यह हटाए जाने वाली "
"कालीसूची में है |"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "अत्यावश्यक पैकेज '%s' को हटाने हेतु चिह्नित किया गया है |"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "कालीसुचित वर्जन '%s' संस्थापित करने की कोशिश कर रहा है"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "%s संस्थापित नहीं हो सका"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "मेटा-पैकेज का अनुमान न करें"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -482,7 +482,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "परिवर्तन की गणना कर रहा है"
@@ -504,7 +504,7 @@
"बाद में कभी पुनःशुरु कर सकते हैं |"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "अद्यतन डाउनलोड नहीं कर सका"
@@ -516,27 +516,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "बचनबद्धता के दौरान त्रुटि"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "मूल तंत्र स्थिति को पुनःसंगृहित कर रहा है"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "अद्यतन को संस्थापित नहीं कर सका"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -544,7 +544,7 @@
"उन्नयन निष्फल हो गया. आपका तंत्र अनुपयोगी स्थिति में आ सकता है | एक समुत्थान "
"अब चलेगा (dpkg --configure -a) |"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -555,7 +555,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -563,20 +563,20 @@
"उन्नयन निष्फल हो गया | कृपया अपने अंतर्जाल संयोजन या संस्थापना मिडिया की "
"जाँच कर लें तथा पुनः प्रयास करें | "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "अप्रचलित पैकेज को हटाएं?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "बनाए रखें (_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "हटाएँ (_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -586,45 +586,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "आवश्यक निर्भर संस्थापित नहीं है"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "आवश्यक निर्भरता '%s' संस्थापित नहीं है. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "पैकेज प्रबंधक की जाँच करें"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "अद्यतन की तैयारी असफल"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "पूर्वापेक्षित अद्यतन को प्राप्त करने में असफल"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -632,7 +632,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -641,23 +641,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "भण्डार सूचना का अद्यतन हो रहा है"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "सीडीरोम जोड़ने में असफल"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "खेद है, सीडीरोम सफलतापूर्वक नहीं जोड़ा जा सका |"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "पैकेज सूचना अवैध"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -669,40 +669,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "आकर्षित कर रहा है"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "अद्यतन कर रहा है"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "अद्यतन पूर्ण"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "उन्नयन पुरा हुआ लेकिम उन्नयन प्रक्रिया के दौरान त्रुटि हुई |"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "अप्रचलित साफ्टवेयर को खोज रहा है"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "तंत्र का अद्यतन पूर्ण |"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "आंशिक अद्यतन पूर्ण हुआ |"
@@ -731,43 +731,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'% s' निकला जा रहा है"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "अद्यतन उपकरण को नहीं चला सका"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "अद्यतन उपकरण हस्ताक्षर"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "अद्यतन उपकरण"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "मिलान करने में असफल"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "अद्यतन का मिलान असफल. यह संजाल समस्या के कारण हो सकता है "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "प्रमाणीकरण असफल"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -775,11 +775,11 @@
"अद्यतन का प्रमाणिकरण निष्फल. यह आपके संजाल या सर्वर के साथ समस्या के काऱण हो "
"सकता है. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "अवतरण करने में असफल"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -787,11 +787,11 @@
"अद्यतन का अवतरण करने में असफल. यह संजाल या सर्वर के साथ समस्या के कारण हो "
"सकता है. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "प्रमाणीकरण असफल"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -799,18 +799,18 @@
"अद्यतन का प्रमाणीकरण असफल. यह संजाल या सर्वर के साथ समस्या के कारण हो सकता "
"है. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "अद्यतन नहीं हो सकता"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "त्रुटि संदेश '%s' है."
@@ -911,11 +911,11 @@
"\n"
"क्या आप आगे बढ़ना चाहते हैं?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 सीपीयु नहीं"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -927,11 +927,11 @@
"यह सम्भव नही है कि आपके तंत्र का उन्नयन इस हार्डवेयर के साथ नए प्रकाशित "
"उबुन्टू में किया जा सके."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 सीपीयु नहीं है"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -943,11 +943,11 @@
"ARMv6 की आवश्यकता होगी. इन हार्डवेयर के साथ उबुन्टू के नए प्रकाशन द्वारा "
"अपने तंत्र को उन्नत करना संभव नहीं है."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init उपलब्ध नहीं है"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -960,11 +960,11 @@
"कार्य कर रहा है. उबुन्टू 10.04 LTS इस प्रकार के वातावरण में कार्य नहीं कर "
"सकता, पहले अपने आभासी मशीन को अद्यतन करने की जरुरत है."
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1684,11 +1684,11 @@
msgid "Downloading the release upgrade tool"
msgstr "प्रकाशित अद्यतन औजार को डाउनलोड करें"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "जाँच करे कि नविनतम डेवेल प्रकाशन में कोटि उन्नयन संभव है या नहीं"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1767,20 +1767,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "कोटि उन्नयन हेतु 'do-release-upgrade' को चलाएं."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "उबुन्टू %(version)s कोटि-उन्नयन हेतु उपलब्ध है"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "आपने उबुन्टू %s का कोटि-उन्नयन का अवनति किया है"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "डिबग आउटपुट जोड़ें"
diff -Nru ubuntu-release-upgrader-17.04.7/po/hr.po ubuntu-release-upgrader-17.10.1/po/hr.po
--- ubuntu-release-upgrader-17.04.7/po/hr.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/hr.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: hr\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Poslužitelj za %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Glavni poslužitelj"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Prilagođeni poslužitelji"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Izračun sources.list stavke nije moguć."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Nije moguće locirati bilo kakve paketne datoteke. Ovo možda nije Ubuntu "
"medij ili se radi o krivoj arhitekturi."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Neuspjelo dodavanje CD-a"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Poruka greške je bila:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Ukloni paket koji je u lošem stanju"
msgstr[1] "Ukloni pakete koji su u lošem stanju"
msgstr[2] "Ukloni pakete koji su u lošem stanju"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +101,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Poslužitelj je možda preopterećen"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Neispravni paketi"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -118,7 +118,7 @@
"softverom. Prije nastavljanja, popravite ih koristeći synaptic ili apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -136,11 +136,11 @@
" * Korištenje neslužbenih softverskih paketa koje ne nudi Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ovo je vjerojatno privremeni problem, pokušajte ponovno kasnije."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -148,15 +148,15 @@
"Ako se ništa od ovoga ne primijeni, onda vas molimo da prijavite ovu grešku "
"koristeći naredbu 'ubuntu-bug ubuntu-release-upgrader-core' u terminalu."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Izračunavanje nadogradnje nije bilo moguće"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Greška pri ovjeri nekih paketa"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -166,7 +166,7 @@
"mrežom, stoga pokušajte ponovno kasnije. Popis neovjerenih paketa dostupan "
"je u nastavku."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -174,22 +174,22 @@
"Paket '%s' je označen za uklanjanje, ali se nalazi na nedopuštenom popisu "
"uklanjanja."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Neophodan paket '%s' je označen za uklanjanje."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Pokušaj instalacije inačice '%s' s nedopuštenog popisa"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ne mogu instalirati '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -197,11 +197,11 @@
"Nemoguće je instalirati potreban paket. Prijavite ovu grešku koristeći "
"naredbu 'ubuntu-bug ubuntu-release-upgrader-core' u terminalu."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nemoguće pretpostavljanje meta-paketa"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -535,7 +535,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Izračunavanje promjena"
@@ -557,7 +557,7 @@
"Nadogradnju možete nastaviti kasnije."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nemoguće preuzimanje nadogradnje"
@@ -571,27 +571,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Greška prilikom izvršavanja"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Vraćanje izvornog stanja sustava"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nadogradnje nisu mogle biti instalirane"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -599,7 +599,7 @@
"Nadogradnja je prekinuta. Vaš sustav bi mogao biti u neupotrebljivom stanju. "
"Popravak će upravo biti pokrenut (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -616,27 +616,27 @@
"dodajte datoteke u /var/log/dist-upgrade/ izvješće greške.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
"Nadogradnja je prekinuta. Vaš sustav bi mogao biti u neupotrebljivom stanju. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ukloni zastarjele pakete?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Zadrži"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Ukloni"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -646,28 +646,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Potrebna zavisnost nije instalirana"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Potrebna zavisnost '%s' nije instalirana. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Provjeravanje upravitelja paketa"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Priprema nadogradnje nije uspjela"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -675,7 +675,7 @@
"Pripremanje sustava za nadogradnju nije uspjelo, stoga se pokreće proces za "
"prijavu greške."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -683,12 +683,12 @@
"Pripremanje sustava za nadogradnju nije uspjelo. Za prijavak greške "
"instalirajte apport i zatim pokrenite 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Preuzimanje preduvjeta za nadogradnju nije uspjelo"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -700,7 +700,7 @@
"\n"
"Dodatno, pokrenut će se proces za prijavu greške."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -714,23 +714,23 @@
"Za prijavak greške instalirajte apport i zatim pokrenite 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Nadogradnja podataka repozitorija"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Neuspjelo dodavanje CD-ROM-a"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Nažalost, dodavanje CD-ROM-a nije uspjelo."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Neispravni podaci paketa"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -749,41 +749,41 @@
"U slučaju preopterećenja zrcalnog poslužitelja, nadogradnju možete pokušati "
"kasnije."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Dohvaćanje"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Nadogradnja"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Nadogradnja završena"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Nadogradnja je završena, ali dogodile su se greške pri procesu nadogradnje."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Tražim zastarjeli softver"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Nadogradnja sustava je završena."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Djelomična nadogradnja dovršena"
@@ -812,17 +812,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "ovjera '%(file)s' protiv '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "raspakiravam '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nemoguće pokretanje alata za nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -830,28 +830,28 @@
"To je najvjerojatnije greška u alatu za nadogradnju. Prijavite ovu grešku "
"koristeći naredbu 'ubuntu-bug ubuntu-release-upgrader-core' u terminalu."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Potpis alata za nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Alat za nadogradnju"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Preuzimanje nije uspjelo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Preuzimanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Ovjera nije uspjela"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -859,11 +859,11 @@
"Ovjera nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s "
"poslužiteljem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Raspakiravanje nije uspjelo."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -871,11 +871,11 @@
"Raspakiravanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži ili "
"na poslužitelju. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Ovjera nije uspjela"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -883,12 +883,12 @@
"Provjera nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s "
"poslužiteljem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Pokretanje nadogradnje nije moguće"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -896,7 +896,7 @@
"Ovo najčešće uzrokuje sustav na kojemu je /tmp montiran s noexec. Montirajte "
"particiju ponovno bez noexec i zatim pokrenite nadogradnju."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Poruka greške je '%s'."
@@ -1010,11 +1010,11 @@
"\n"
"Želite li nastaviti?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nema i686 procesora"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1026,11 +1026,11 @@
"minimalnu arhitekturu. S ovim hardverom nije moguće obaviti nadogradnju na "
"novu inačicu Ubuntua."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nedostaje ARMv6 procesor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1042,11 +1042,11 @@
"minimalnu arhitekturu. Nadogradnja vašeg sustava na novo izdanje Ubuntua "
"nije moguće na ovom hardveru."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nema dostupnog inita"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1062,11 +1062,11 @@
"\n"
"Želite li nastaviti?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nije omogućen"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1810,11 +1810,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Preuzimanje alata za nadogradnju izdanja"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Provjeri je li nadogradnja na novije razvojno izdanje dostupna"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1893,20 +1893,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Pokrenite 'do-release-upgrade' za nadogradnju izdanja."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Nadopunitelj softvera"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Dostupna je nadogradnja na Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Odbili ste nadogradnju na Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Dodaj informacije za otklanjanje grešaka"
diff -Nru ubuntu-release-upgrader-17.04.7/po/hu.po ubuntu-release-upgrader-17.10.1/po/hu.po
--- ubuntu-release-upgrader-17.04.7/po/hu.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/hu.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: hu\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Kiszolgáló a következőhöz: %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Fő kiszolgáló"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Egyéni kiszolgálók"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nem határozható meg a sources.list bejegyzés"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Egyetlen csomagfájl sem található! Lehet, hogy nem Ubuntu lemezt, vagy más "
"architektúrához tartozót helyezett a meghajtóba."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "A CD hozzáadása meghiúsult"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"A hibaüzenet:\n"
"„%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Hibás állapotban levő csomag eltávolítása"
msgstr[1] "Hibás állapotban levő csomagok eltávolítása"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Lehet, hogy a kiszolgáló túlterhelt"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Törött csomagok"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"segítségével."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -131,11 +131,11 @@
" * Nemhivatalos csomagok, melyeket nem az Ubuntu szolgáltat\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ez valószínűleg átmeneti probléma, próbálkozzon később."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Ha a felsoroltak egyike sem áll fenn, akkor jelentse ezt a hibát a "
"terminálban kiadott „ubuntu-bug ubuntu-release-upgrader-core” paranccsal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "A frissítés előkészítése sikertelen"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Hiba történt néhány csomag hitelesítése közben"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi "
"felsorolás a hitelesíthetetlen csomagokat tartalmazza."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,22 +169,22 @@
"A(z) „%s” nevű csomagot eltávolításra jelölte ki, de ez rajta van az "
"eltávolítási feketelistán."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "A létfontosságú „%s” csomagot eltávolításra jelölte ki."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Kísérlet a feketelistára tett „%s” verzió telepítésére"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "„%s” nem telepíthető"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -192,11 +192,11 @@
"Az igényelt csomag telepítése lehetetlen volt. Jelentse ezt a hibát a "
"terminálban kiadott „ubuntu-bug ubuntu-release-upgrader-core” paranccsal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "A meta-csomag megállapítása sikertelen"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -522,7 +522,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Módosítások előkészítése"
@@ -544,7 +544,7 @@
"visszaállítva. A frissítést később lehet folytatni."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "A frissítések nem tölthetők le"
@@ -559,27 +559,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Hiba a módosítások rögzítése közben"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "A rendszer eredeti állapotának helyreállítása"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "A frissítések nem telepíthetők"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -587,7 +587,7 @@
"A frissítés megszakadt. A rendszer használhatatlan állapotban lehet. A "
"helyreállítás azonnal indul (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -604,7 +604,7 @@
"címre, és csatolja a fájlokat a /var/log/dist-upgrade/ mappából.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -612,20 +612,20 @@
"A frissítés megszakadt. Ellenőrizze az internetkapcsolatát vagy a telepítési "
"adathordozót, és próbálja újra. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Eltávolítja az elavult csomagokat?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Megtartás"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Eltávolítás"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -635,28 +635,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "A szükséges függőségek nincsenek telepítve"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "A következő függőség nincs telepítve: %s. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Csomagkezelő ellenőrzése"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "A frissítés előkészítése meghiúsult"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -664,7 +664,7 @@
"A rendszer előkészítése a frissítésre sikertelen, emiatt elindul egy "
"hibajelentési folyamat."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -673,12 +673,12 @@
"telepítse az apport csomagot, és adja ki az „apport-bug ubuntu-release-"
"upgrader” parancsot."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "A frissítés előfeltételeinek lekérése meghiúsult"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -691,7 +691,7 @@
"\n"
"Ezen kívül elindul egy hibajelentési folyamat is."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,23 +705,23 @@
"Hiba jelentéséhez telepítse az apport csomagot, és adja ki az „apport-bug "
"ubuntu-release-upgrader” parancsot."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Tárolóinformációk frissítése"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Nem sikerült a CD-ROM hozzáadása"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Elnézést, a CD-ROM hozzáadása sikertelen."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Érvénytelen csomaginformációk"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -739,41 +739,41 @@
"szoftverforrások listájának megtekintéséhez.\n"
"Ha a tükörszerver túlterhelt, érdemes megpróbálni a frissítést később."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Letöltés"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Frissítés"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "A frissítés befejeződött"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"A frissítés befejeződött, de hibák történtek a frissítési folyamat alatt."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Elavult szoftverek keresése"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "A rendszer frissítése befejeződött."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Az intelligens frissítés sikeresen befejeződött."
@@ -802,17 +802,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "„%(file)s” hitelesítése ezzel: „%(signature)s” "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "„%s” kicsomagolása"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nem sikerült futtatni a frissítőeszközt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -820,29 +820,29 @@
"Ez valószínűleg egy hiba a frissítési eszközben. Jelentse a hibát az „ubuntu-"
"bug ubuntu-release-upgrader-core” paranccsal."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Frissítőeszköz aláírása"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Frissítőeszköz"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "A letöltés meghiúsult"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"A frissítés letöltése meghiúsult. Lehetséges, hogy hálózati probléma áll "
"fenn. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Hitelesítés sikertelen"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -850,11 +850,11 @@
"A frissítés hitelesítése meghiúsult. Probléma lehet a hálózattal vagy a "
"kiszolgálóval. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "A kibontás meghiúsult"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -862,11 +862,11 @@
"A frissítés kibontása meghiúsult. Probléma lehet a hálózattal vagy a "
"kiszolgálóval. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Az ellenőrzés meghiúsult"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -874,12 +874,12 @@
"A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a "
"kiszolgálóval. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "A frissítés nem futtatható!"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -888,7 +888,7 @@
"felcsatolva. Kérjük csatolja újra nooexec kapcsolóval, majd próbálja újból a "
"frissítést."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "A hibaüzenet: „%s”."
@@ -1003,11 +1003,11 @@
"\n"
"Biztosan folytatja?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nem i686-os CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1019,11 +1019,11 @@
"optimalizációkkal készült. Rendszere ezzel a hardverrel nem frissíthető új "
"Ubuntu kiadásra."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nem ARMv6 processzor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1035,11 +1035,11 @@
"optimalizációkkal készült. Ezen a hardveren nem frissíthető a rendszer új "
"Ubuntu kiadásra."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nem érhető el init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1054,11 +1054,11 @@
"\n"
"Biztosan folytatja?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "A PAE nincs bekapcsolva"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1793,12 +1793,12 @@
msgid "Downloading the release upgrade tool"
msgstr "A kiadásfrissítő eszköz letöltése"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Ellenőrzi, hogy lehetséges-e frissíteni a legújabb fejlesztői kiadásra"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1877,20 +1877,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "A frissítéshez futassa a „do-release-upgrade” parancsot."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Frissítéskezelő"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s frissítés érhető el"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ön elutasította az Ubuntu %s kiadásra történő frissítést"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Hibakeresési kimenet hozzáadása"
diff -Nru ubuntu-release-upgrader-17.04.7/po/hy.po ubuntu-release-upgrader-17.10.1/po/hy.po
--- ubuntu-release-upgrader-17.04.7/po/hy.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/hy.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: hy\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Սերվեր %s-ի համար"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Հիմնակամ սպասարկիչ"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Սերվերը կարող է գերծանրաբեռնված լինել"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Վնասված փաթեթներ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ia.po ubuntu-release-upgrader-17.10.1/po/ia.po
--- ubuntu-release-upgrader-17.04.7/po/ia.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ia.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,11 +15,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servitor pro %s"
@@ -27,20 +27,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servitor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servitores personal"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Incapace a calcular le entrata de sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -48,11 +48,11 @@
"Incapace a locar alcun files de pacchetto, forsan isto non es un disco "
"Ubuntu o le improprie architectura?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Falta al addition del CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,13 +67,13 @@
"Le message de error esseva:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remover le pacchetto in mal state"
msgstr[1] "Remover le pacchettos in mal state"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -94,15 +94,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Le servitor pote ser supercargate"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pacchettos rupte"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -111,7 +111,7 @@
"Per favor fixar illos antea usante synaptic o apt-get ante proceder."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -129,13 +129,13 @@
" * Pacchettos software non official non providite per Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Isto es maxime verisimilemente un problema fugace, per favor probar ancora "
"un vice postea."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Si necun de iste es applicabile, alora per favor reporta ce defecto usante "
"le commando: 'ubuntu-bug ubuntu-release-upgrader-core', in un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Impossibile calcular le promotion"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error in le authentication de alcun pacchettos"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"problema fugace de rete. Tu pote probar un altere vice postea. Vider in "
"basso pro un lista de pacchettos apocryphe."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,22 +169,22 @@
"Le pacchetto '%s' es marcate pro le remotion, ma illo es in le lista nigre "
"de remotion."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Le pacchetto essential '%s' es marcate pro le remotion."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Provar a installar le version '%s' del lista nigre"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Impossibile installar '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -193,11 +193,11 @@
"isto como un defecto per le commando 'ubuntu-bug ubuntu-release-upgrader-"
"core' in un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Non pote divinar le meta-pacchetto"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -524,7 +524,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculo del modificationes"
@@ -546,7 +546,7 @@
"restaurate. Tu pote resumer le ajornamento a un tempore successive."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Impossibile discargar le ajornamentos"
@@ -561,27 +561,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error durante le commission"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restauration del stato del systema originari"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Impossibile installar le ajornamentos"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -589,7 +589,7 @@
"Le ajornamento ha abortate. Tu systema poterea ser in un stato inusabile. Un "
"restabilimento fluera nunc (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -606,7 +606,7 @@
"connecte le files in /var/log/dist-upgrade/ al reporto de defecto.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -614,20 +614,20 @@
"Le ajornamento ha abortate. Per favor controla tu connexion Internet o tu "
"medios de installation e reproba. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Levar le pacchettos obsolete?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "Conservar (_Keep)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Remover"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -638,28 +638,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Le necessari dependentia '%s' non es installate."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Le necessari dependentia '%s' non es installate. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Controlo del gestor de pacchetto"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparation del promotion fallite"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -667,7 +667,7 @@
"Preparation del systema al promotion fallite, assi un processo de reporto de "
"defecto va ser lanceate."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -675,12 +675,12 @@
"Preparation del systema pro le promotion fallite. Pro reportar un defecto "
"installar apport e pois exequer 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Obtenimento del pre-requisitos de promotion fallite"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -692,7 +692,7 @@
"\n"
"Additionalmente, un processo de reporto de defecto va ser lanceate."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -706,23 +706,23 @@
"Pro reportar un defecto installar apport e pois exequer 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ajornamento del information de repositorio"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Fallite a adder le CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Displacente, le addition del CDROM non ha habite successo."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Information de pacchetto non valide"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -741,41 +741,41 @@
"In le caso de un speculo supercargate, tu pote desirar de probar le "
"ajornamento un altere vice successivemente."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Extration"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "In promotion"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Promotion complete"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Le promotion ha clause ma il era errores durante le processo de promotion."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "In cerca pro software obsolete"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Le promotion del systema es complete."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Le promotion partial ha essite clause."
@@ -804,17 +804,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "authenticar le '%(file)s' contra le '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extraction de '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Impossibile facer fluer le application de promotion"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -823,28 +823,28 @@
"reportar lo como un defecto per le commando 'ubuntu-bug ubuntu-release-"
"upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Firma del application de promotion"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Application de promotion"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Fallite a extraher"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Extraction del ajornamento fallite. Il pote ser un problema de rete. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Authentication fallite"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -852,11 +852,11 @@
"Authentication del promotion fallite. Il pote ser un problema con le rete o "
"con le servitor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Fallite a extraher"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -864,11 +864,11 @@
"Extraction del promotion fallite. Il pote ser un problema con le rete o con "
"le servitor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verification fallite"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -876,12 +876,12 @@
"Controlo del promotion fallite. Il pote ser un problema con le rete o con le "
"servitor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Impossibile facer fluer le promotion"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -889,7 +889,7 @@
"Isto de costume es causate per un systema a ubi /tmp es montate noexec. Per "
"favor remonta sin noexec e face fluer novemente le ajornamento."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Le message de error es '%s'."
@@ -1003,11 +1003,11 @@
"\n"
"Desira tu continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nulle CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1018,11 +1018,11 @@
"pacchettos era construite con le optimisationes necessari pro le i686 como "
"minime architectura."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nulle CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1034,11 +1034,11 @@
"ARMv6 como minime architectura. Il non es possibile promover tu systema a un "
"nove version de Ubuntu con ce hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nulle init disponibile"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1054,11 +1054,11 @@
"\n"
"Desira tu vermente continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE no activate"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1792,11 +1792,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Discargamento del application de promotion del version"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Controlar si es possibile le ajornamento al plus recente nivello"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1877,19 +1877,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Exeque 'do-release-upgrade' pro promover a illo."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Ajornator del software"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s promotion disponibile"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Tu ha declinate le promotion a Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Adder le output de correction de defectos"
diff -Nru ubuntu-release-upgrader-17.04.7/po/id.po ubuntu-release-upgrader-17.10.1/po/id.po
--- ubuntu-release-upgrader-17.04.7/po/id.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/id.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: id\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server untuk %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Server utama"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Server custom"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Tidak dapat mengkalkulasi masukan sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Tidak dapat menemukan berkas paket apapun, mungkin ini bukan Disk Ubuntu "
"atau arsitektur yang salah?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Gagal untuk menambahkan CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,12 +68,12 @@
"Pesan kesalahan adalah: \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Hapus paket yang kondisinya buruk"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -90,15 +90,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server mungkin kelebihan beban"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paket rusak"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -108,7 +108,7 @@
"synaptic atau apt-get sebelum melanjutkan hal ini."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -126,25 +126,25 @@
" * Paket perangkat lunak tak resmi yang tidak disediakan oleh Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ini sepertinya masalah sementara saja, coba lagi nanti."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Tidak dapat menghitung peningkatan versi"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Kesalahan membuktikan keabsahan beberapa paket"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -154,7 +154,7 @@
"mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat "
"lagi. Lihat senarai dari paket yang belum terbukti keabsahannya dibawah ini."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -162,32 +162,32 @@
"Paket '%s' ditandai untuk dibuang namun paket tersebut berada pada daftar "
"hitam buangan."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Paket penting '%s' ditandai untuk dibuang"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Mencoba memasang versi '%s' yang dicekal"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Tidak dapat memasang '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Tidak dapat menebak paket-meta"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -499,7 +499,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Menghitung perubahan"
@@ -521,7 +521,7 @@
"Anda dapat meneruskan peningkatan di lain waktu."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Tidak dapat mengunduh pemutakhiran"
@@ -536,27 +536,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Kesalahan pada waktu commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Sistem dikembalikan ke keadaan awal"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Tidak dapat menginstal pemutakhiran"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -565,7 +565,7 @@
"dapat dipakai. Suatu pemulihan akan dijalankan sekarang (dpkg --configure -"
"a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -576,7 +576,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -584,20 +584,20 @@
"Peningkatan telah digugurkan. Silakan periksa koneksi Internet atau media "
"pemasangan Anda dan coba lagi. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Hapus paket usang?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Simpan"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Hapus"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -607,34 +607,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Dependensi yang dibutuhkan belum terpasang."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Dependensi yang dibutuhkan '%s' belum terpasang. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Memeriksa manajer paket"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Persiapan peningkatan versi gagal"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -642,12 +642,12 @@
"Penyiapan sistem untuk peningkatan gagal. Untuk melaporkan kutu pasanglah "
"apport lalu jalankan 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Gagal mendapatkan persiapan upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -655,7 +655,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -669,23 +669,23 @@
"Untuk melaporkan kutu pasanglah apport lalu jalankan 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Memutakhirkan informasi gudang"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Gagal untuk menambahkan ke cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Maaf, penambahan cdrom tidak berhasil."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informasi paket tidak valid"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -697,41 +697,41 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Menjemput"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Meng-upgrade"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Peningkatan versi selesai"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Peningkatan telah lengkap tetapi ada masalah selama proses peningkatan."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Mencari perangkat lunak usang"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Upgrade sistem telah selesai."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Pemutakhiran parsial selesai."
@@ -760,43 +760,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Tidak dapat menjalankan alat upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Tanda tangan peralatan upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Peralatan upgrade"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Gagal untuk fetch"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Gagal meng-fetch upgrade. Terjadi masalah pada jaringan. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Otentikasi gagal"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -804,11 +804,11 @@
"Otentikasi upgrade gagal. Mungkin terjadi masalah dengan jaringan atau "
"dengan server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Gagal mengekstrak"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -816,23 +816,23 @@
"Gagal mengekstrak upgrade. Mungkin terjadi masalah dengan jaringan atau "
"dengan server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifikasi gagal"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Pemeriksaan peningkatan gagal. Mungkin ada masalah jaringan atau server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Tak dapat menjalankan pemutakhiran"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -840,7 +840,7 @@
"Ini biasanya disebabkan oleh sistem dimana /tmp dikait noexec. Silakan kait "
"ulang tanpa noexec dan jalankan peningkatan lagi."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Pesan kesalahannya adalah '%s'."
@@ -943,11 +943,11 @@
"\n"
"Anda ingin melanjutkan?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "CPU i686 tidak ditemukan"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -959,11 +959,11 @@
"i686 sebagai arsitektur minimal. Tak mungkin untuk meningkatkan sistem Anda "
"ke rilis Ubuntu yang baru dengan perangkat keras yang ada."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "CPU ARMv6 tidak ada"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -975,11 +975,11 @@
"arsitektur minimal. Tidak mungkin meningkatkan sistem Anda ke rilis baru "
"Ubuntu dengan perangkat keras ini."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Tidak ada 'init' yang tersedia"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -994,11 +994,11 @@
"\n"
"Anda yakin akan melanjutkan?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE tak difungsikan"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1719,12 +1719,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Sedang mengunduh alat peningkatan rilis"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Memeriksa bila menaikkan versi ke rilis pengembangan terakhir mungkin"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1803,20 +1803,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Jalankan 'do-release-upgrade' untuk meningkatkannya."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Pemutakhir Perangkat Lunak"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Peningkatan ke Ubuntu %(version)s Tersedia"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Anda telah menolak peningkatan ke Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/is.po ubuntu-release-upgrader-17.10.1/po/is.po
--- ubuntu-release-upgrader-17.04.7/po/is.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/is.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: is\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Netþjónn fyrir %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Aðalnetþjónn"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Sérsniðnir netþjónar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Tölvan fann engar pakkaskrár, er þetta örugglega Ubuntu-diskur eða kannski "
"vitlausa gerðin?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Gat ekki bætt við geisladisknum"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Villuskilaboðin voru:\n"
"‚%s‘"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Fjarlægja pakka sem er í slæmu ástandi"
msgstr[1] "Fjarlægja pakka sem eru í slæmu ástandi"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Netþjónninn gæti verið undir miklu álagi"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Bilaðir pakkar"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"haldið."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -125,25 +125,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Þetta er væntanlega tímabundið vandamál. Reyndu aftur síðar."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Gat ekki reiknað út uppfærsluna"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Villa kom upp við auðkenningu nokkra pakka"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -153,7 +153,7 @@
"netvandamál- reyndu aftur síðar. Að neðan er listi yfir þá pakka sem ekki "
"tókst að staðfesta."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -161,32 +161,32 @@
"Gefin var skipun um að fjarlægja pakkann ‚%s‘ en það er bannað að fjarlægja "
"hann."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Það á að fjarlægja pakkann ‚%s‘ en hann er ómissandi."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Reyni að setja upp svartlistaða útgáfu ‚%s‘"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Gat ekki sett upp ‚%s‘"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Get ekki giskað á lýsipakka"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -466,7 +466,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Reikna út breytingar"
@@ -486,7 +486,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Gat ekki sótt uppfærslurnar"
@@ -498,33 +498,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Villa við staðfestingu"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Gat ekki sett upp uppfærslurnar"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -535,26 +535,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Viltu fjarlægja úrelta pakka?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Halda"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Fjarlægja"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -564,45 +564,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Það er ekki búið að setja upp nauðsynleg ákvæði"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Það er ekki búið að setja upp ákvæðið ‚%s‘ sem er nauðsynlegt. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Athuga pakkastjórann"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Undirbúningur fyrir uppfærslu mistókst"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Það tókst ekki að útvega forsendur uppfærslunnar"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -610,7 +610,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -619,23 +619,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Uppfæri upplýsingar um gagnahirslur"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Gat ekki bætt við geisladisknum"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ógildar pakkaupplýsingar"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -647,40 +647,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Sæki"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Uppfæri"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Uppfærslu lokið"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Leita að úreltum hugbúnaði"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Stýrikerfisuppfærslu er lokið."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Takmarkaðri uppfærslu er lokið."
@@ -709,44 +709,44 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Gat ekki keyrt uppfærslutólið"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Auðkenni uppfærslutóls"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Uppfærsluforrit"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Ekki tókst að sækja"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Það tókst ekki að sækja uppfærsluna. Þetta gæti verið vandamál með netið. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Auðkenning mistókst"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -754,11 +754,11 @@
"Það tókst ekki að auðkenna uppfærsluna. Þetta er mögulega vandamál við "
"nettenginguna eða netþjóninn. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Gat ekki afþjappað"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -766,11 +766,11 @@
"Það mistókst að nálgast upplýsingarnar um uppfærsluna. Þetta er mögulega "
"vandamál við nettenginguna eða netþjóninn. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Staðfesting mistókst"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -778,18 +778,18 @@
"Það tókst ekki að staðfesta uppfærsluna. Það gæti verið vandamál með "
"nettenginguna eða netþjóninn. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Get ekki keyrt uppfærsluna"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Villuskilaboðið er ‚%s‘."
@@ -890,11 +890,11 @@
"\n"
"Viltu halda áfram?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -902,11 +902,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Enginn ARMv6-örgjörvi"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -917,11 +917,11 @@
"í karmic þurfa að lágmarki örgjörva af útgáfu ARMv6. Það er ekki hægt að "
"uppfæra stýrikerfi þitt yfir í nýja útgáfu af Ubuntu með þessum vélbúnaði."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "‚init‘ fannst ekki"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -931,11 +931,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1643,11 +1643,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Sækir uppfærslutólið fyrir útgáfuna"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Athuga hvort hægt sé að uppfæra í nýjustu þróunarútgáfuna"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1715,20 +1715,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Keyrðu ‚do-release-upgrade‘ til að hefja uppfærsluna."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Uppfærsla í Ubuntu %(version)s er tiltæk"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Þú hefur hafnað uppfærslu í Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/it.po ubuntu-release-upgrader-17.10.1/po/it.po
--- ubuntu-release-upgrader-17.04.7/po/it.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/it.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: it\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server in %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Server principale"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Server personalizzati"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Impossibile calcolare la voce di sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -52,11 +52,11 @@
"selezionato un disco di Ubuntu o che l'architettura installata sia "
"differente."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Aggiunta del CD non riuscita"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -72,13 +72,13 @@
"Il messaggio di errore è stato:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Rimuovi il pacchetto danneggiato"
msgstr[1] "Rimuovi i pacchetti danneggiati"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -98,15 +98,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Il server potrebbe essere sovraccarico"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pacchetti danneggiati"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -116,7 +116,7 @@
"«synaptic» o «apt-get»."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -135,13 +135,13 @@
" * Pacchetti software non ufficiali non forniti da Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Si tratta molto probabilmente di un problema momentaneo, riprovare in un "
"secondo momento."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -149,15 +149,15 @@
"Se non vengono installati, segnalare il problema usando il comando «ubuntu-"
"bug ubuntu-release-upgrader-core» in un terminale."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Impossibile calcolare l'avanzamento"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Errore nell'autenticare alcuni pacchetti"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -167,7 +167,7 @@
"un problema di rete passeggero, è possibile riprovare più tardi. Segue "
"l'elenco dei pacchetti non autenticati."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -175,23 +175,23 @@
"Il pacchetto «%s» è selezionato per la rimozione, ma è nella blacklist per "
"la rimozione."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Il pacchetto essenziale «%s» è selezionato per la rimozione."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Tentativo di installazione della versione «%s» presente nella blacklist"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Impossibile installare «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -200,11 +200,11 @@
"problema usando il comando «ubuntu-bug ubuntu-release-upgrader-core» in un "
"terminale."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Impossibile indovinare il meta-pacchetto"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -533,7 +533,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calcolo delle modifiche"
@@ -556,7 +556,7 @@
"un secondo momento."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Impossibile scaricare gli avanzamenti di versione"
@@ -571,27 +571,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Errore durante il commit"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Ripristino dello stato originale del sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Impossibile installare gli avanzamenti di versione"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -599,7 +599,7 @@
"L'avanzamento si è interrotto: il sistema potrebbe essere in uno stato "
"inutilizzabile. Verrà avviato un ripristino (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -616,7 +616,7 @@
"allegando alla segnalazione i file presenti in /var/log/dist-upgrade/.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -624,20 +624,20 @@
"L'avanzamento si è interrotto: controllare la connessione a Internet o il "
"supporto di installazione e riprovare. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Rimuovere i pacchetti obsoleti?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Mantieni"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Rimuovi"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -647,28 +647,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Le dipendenze richieste non sono installate"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dipendenza richiesta «%s» non è installata. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Controllo gestore dei pacchetti"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparazione dell'avanzamento di versione non riuscita"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -676,7 +676,7 @@
"La preparazione del sistema per l'avanzamento non è riuscita. Sarà ora "
"possibile segnalare questo problema."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -685,12 +685,12 @@
"un bug, installare apport ed eseguire il comando «apport-bug ubuntu-release-"
"upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Recupero dei prerequisiti per l'avanzamento di versione non riuscito"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -702,7 +702,7 @@
"\n"
"Sarà ora possibile segnalare questo problema."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -716,23 +716,23 @@
"Per segnalare il problema installare apport ed eseguire il comando «apport-"
"bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Aggiornamento delle informazioni sui repository"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Aggiunta CD-ROM non riuscita"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "L'aggiunta del CD-ROM non è avvenuta con successo."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informazioni di pacchetto non valide"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -744,42 +744,42 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Recupero file"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Avanzamento versione"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Avanzamento di versione completato"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"L'avanzamento di versione è stato completato, ma durante l'operazione si "
"sono verificati degli errori."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Ricerca di software obsoleto"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "L'avanzamento di versione del sistema è stato completato."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "L'avanzamento parziale è stato completato."
@@ -808,17 +808,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autenticazione di «%(file)s» con «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "estrazione di «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Impossibile eseguire lo strumento di avanzamento versione"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -827,29 +827,29 @@
"aggiornamento. Segnalarlo usando il comando «ubuntu-bug ubuntu-release-"
"upgrader-core» in un terminale."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Firma dello strumento di avanzamento versione"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Strumento di avanzamento versione"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Recupero non riuscito"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Il recupero dei file per l'avanzamento di versione non è riuscito. Potrebbe "
"dipendere da un problema di rete. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autenticazione non riuscita"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -857,11 +857,11 @@
"Non è riuscita l'autenticazione dell'avanzamento di versione. Potrebbe "
"dipendere da un problema con la connessione di rete o con il server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Estrazione non riuscita"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -869,11 +869,11 @@
"Non è riuscita l'estrazione dell'aggiornamento. Potrebbe dipendere da un "
"problema con la connesione di rete o con il server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifica non riuscita"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -881,12 +881,12 @@
"Non è riuscita la verifica dell'avanzamento di versione. Potrebbe dipendere "
"da un problema con la connessione di rete o con il server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Impossibile eseguire l'avanzamento"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -894,7 +894,7 @@
"Questo di solito succede se /tmp è montata in modalità noexec. Montarla "
"senza modalità noexec ed eseguire nuovamente l'avanzamento."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Il messaggio di errore è «%s»."
@@ -1008,11 +1008,11 @@
"\n"
"Continuare comunque?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "CPU non compatibile"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1025,11 +1025,11 @@
"A causa di tale configurazione hardware non è possibile aggiornare questo "
"sistema a un nuovo rilascio di Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nessuna CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1041,11 +1041,11 @@
"richiedono ARMv6 come architettura minima. Non è possibile avanzare il "
"sistema a un nuovo rilascio di Ubuntu con l'hardware attuale."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "\"init\" non disponibile"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1061,11 +1061,11 @@
"\n"
"Continuare comunque?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE non abilitato"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1803,11 +1803,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Scaricamento dello strumento di avanzamento versione"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Verifica se è possibile avanzare all'ultima versione di sviluppo"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1888,20 +1888,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Lanciare «do-release-upgrade» per eseguire l'avanzamento."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Aggiornamenti software"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Disponibile avanzamento a Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "È stato rifiutato l'avanzamento alla versione %s di Ubuntu"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Abilitare le informazioni di debug"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ja.po ubuntu-release-upgrader-17.10.1/po/ja.po
--- ubuntu-release-upgrader-17.04.7/po/ja.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ja.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s にあるサーバー"
@@ -30,30 +30,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "メインサーバー"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "カスタムサーバー群"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.listのエントリーから作業内容を見積もれません"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "パッケージファイルが見つかりません。UbuntuのCDではないか、異なるアーキテクチャー向けのCDかもしれません。"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CDの追加に失敗しました"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,12 +68,12 @@
"エラーメッセージ:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "壊れた状態のパッケージを削除する"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -89,15 +89,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "サーバーが過負荷状態にある可能性があります"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -105,7 +105,7 @@
"システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれています。 Synaptic や apt-get を使って最初に修正してください。"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -123,11 +123,11 @@
" * Ubuntu以外から提供されている非公式パッケージ\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "これは一時的な問題のようです。後でもう一度試してください。"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -135,15 +135,15 @@
"いずれかにも当てはまらない場合には、端末上から 'ubuntu-bug ubuntu-release-upgrader-core' "
"を実行してこのバグを報告してください。"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "アップグレード作業を見積もれません"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "パッケージの認証において、エラーがありました"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -152,28 +152,28 @@
"いくつかのパッケージが認証できませんでした。これは一時的なネットワークの問題かもしれません。あとで再び試してみてください。以下に認証できなかったパッケージ"
"のリストが表示されます。"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "パッケージ'%s'は「削除」と指定されていますが、削除ブラックリストに入っています。"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "必須パッケージ'%s'に「削除」マークがついています。"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "ブラックリストに入っているバージョン '%s' をインストールしようとしています"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'をインストールすることができません。"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -181,11 +181,11 @@
"必要なパッケージをインストールできませんでした。端末上から 'ubuntu-bug ubuntu-release-upgrader-core' "
"を実行し、これをバグとして報告してください。"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "メタパッケージを推測できません"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -483,7 +483,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "変更点を確認中"
@@ -503,7 +503,7 @@
msgstr "アップグレードはすぐにキャンセルされ、システムは元の状態に戻ります。後でアップグレードをやり直すことができます。"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "アップグレードに必要なデータをダウンロードできません"
@@ -517,34 +517,34 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "反映中にエラーが発生しました"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "システムを元に戻しています"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "アップグレードをインストールできません"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
"アップグレードを中断しました。システムが不安定な状態の可能性があります。今からリカバリーを実行します。(dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -560,26 +560,26 @@
"upgrader/+filebug を開き /var/log/dist-upgrade/ にあるファイルを添付し、このバグを報告してください。\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr "アップグレードを中断しました。インターネット接続またはインストールメディアを確認して、もう一度実行してください。 "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "サポートが中止された(あるいはリポジトリに存在しない)パッケージを削除しますか?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "そのまま(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "削除(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -587,34 +587,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "依存するパッケージがインストールされていません"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "依存するパッケージ '%s' がインストールされていません。 "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "パッケージマネージャーをチェック中です"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "アップグレードの準備に失敗しました"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "アップグレードのための準備に失敗しました。それによりバグ報告のプロセスが開始されました。"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -622,12 +622,12 @@
"システムのアップグレード準備に失敗しました。バグ報告を行うには apport をインストールしてから 'apport-bug ubuntu-"
"release-upgrader' を実行してください。"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "アップグレードの事前作業に失敗しました"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -638,7 +638,7 @@
"\n"
"同時にバグ報告のプロセスが開始されました。"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -650,23 +650,23 @@
"\n"
"バグ報告を行うには apport をインストールしてから 'apport-bug ubuntu-release-upgrader' を実行してください。"
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "リポジトリ情報のアップデート"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "cdromの追加に失敗しました"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "cdrom の追加に失敗しました。"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "利用できないパッケージ情報です"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -678,40 +678,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "取得中"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "アップグレード中です"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "アップグレードが完了しました"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "アップグレードは完了しましたが、アップグレード中にいくつかのエラーが発生しました。"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "古いソフトウェアを検索しています"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "システムのアップグレードが完了しました。"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "部分的なアップグレードが完了しました。"
@@ -740,17 +740,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "「%(signature)s」を用いて「%(file)s」の認証を行ないます "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' の展開中"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "アップグレード・ツールを実行できません"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -758,58 +758,58 @@
"これはアップグレードツールのバグと思われます。これを 'ubuntu-bug ubuntu-release-upgrader-core' "
"というコマンドを実行してバグとして報告してください。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "ツールの署名のアップグレード"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "ツールのアップグレード"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "取得に失敗しました"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "アップグレードの取得に失敗しました。おそらくネットワークの問題です。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "認証に失敗しました"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "アップグレードの認証に失敗しました。おそらくネットワークまたはサーバーの問題です。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "抽出に失敗しました"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "アップグレードの展開に失敗しました。おそらくネットワークまたはサーバーの問題です。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "認証に失敗しました"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "アップグレードの検証に失敗しました。ネットワーク接続もしくはサーバーに問題があるかもしれません。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "アップグレードを実行できません"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -817,7 +817,7 @@
"この現象は、通常/tmpがnoexecでマウントされている場合にシステムで発生します。noexecを付けずに再マウントして、再度アップグレードを実行してく"
"ださい。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "エラーメッセージは'%s'です。"
@@ -926,11 +926,11 @@
"\n"
"作業を続けますか?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 CPU ではありません"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -941,11 +941,11 @@
"を使用しています。すべてのパッケージは、最低限のアーキテクチャとして i686 "
"を必要とする最適化でビルドされています。このハードウェアでは、新しいバージョンの Ubuntu にアップグレードすることができません。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 準拠ではない CPU です"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -956,11 +956,11 @@
"アーキテクチャへの対応が必須な最適化オプションを利用してビルドされています。このハードウェアでは新しい Ubuntu "
"のリリースにアップグレードできません。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "initデーモンが見つかりません"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -974,11 +974,11 @@
"\n"
"本当に作業を進めてよろしいですか?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAEが有効になっていません"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1675,11 +1675,11 @@
msgid "Downloading the release upgrade tool"
msgstr "リリースアップグレードツールのダウンロード"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "最新の開発リリースへのアップデートが利用可能かどうかチェックする"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "アップグレードソフトウェアを使って $distro-proposed から最新のリリースへのアップグレードを試す"
@@ -1752,20 +1752,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "'do-release-upgrade' を実行してアップグレードしてください"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "ソフトウェアアップデーター"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s のアップグレードが利用可能です"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ubuntu %s へのアップグレードを拒絶"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "デバッグ出力を追加"
diff -Nru ubuntu-release-upgrader-17.04.7/po/jv.po ubuntu-release-upgrader-17.10.1/po/jv.po
--- ubuntu-release-upgrader-17.04.7/po/jv.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/jv.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: jv\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ka.po ubuntu-release-upgrader-17.10.1/po/ka.po
--- ubuntu-release-upgrader-17.04.7/po/ka.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ka.po 2017-04-24 21:05:20.000000000 +0000
@@ -19,12 +19,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ka\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "სერვერი %s"
@@ -32,20 +32,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "მთავარი სერვერი"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "საკუთარი სერვერები"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "შეუძლებელი გახდა sources.list-ის ელემენტთა დათვლა"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -53,11 +53,11 @@
"პაკეტების ფაილები ვერ მოინახა, იქნებ ეს არ არის Ubuntu-ს დისკი ან არასწორი "
"არქიტეკტურაა?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "ვერ განხორციელდა CD-ს დამატება"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -72,12 +72,12 @@
"ინფორმაცია ხარვეზის შესახებ:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "დაზიანებული პაკეტების მოშორება"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -93,15 +93,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "შესაძლოა ფაილ-სერვერი გადატვირთულია"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "დაზიანებული პაკეტები"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -111,7 +111,7 @@
"საშუალებით) და შემდეგ გააგრძელეთ."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -122,25 +122,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "შესაძლოა დროებითი პრობლემის ბრალი იყოს. სცადეთ მოგვიანებით."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "სისტემა ვერ მომზადდა განახლებისათვის"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -150,38 +150,38 @@
"ხარვეზი. სცადეთ მოგვიანებით. ქვევით იხილეთ არააუთენთიფიცირებული პაკეტების "
"სია."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ვერ დაყენდა"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "მეტა-პაკეტი ვერ შეირჩა"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -445,7 +445,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "ცვლილებების გამოთვლა"
@@ -465,7 +465,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "განახლებების ჩამოტვირთვა ვერ ხერხდება"
@@ -477,33 +477,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "შეცდომა გადაცემისას"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "სისტემის საწყისი მდგომარეობის აღდგენა"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "განახლებების დაყენება ვერ ხერხდება"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -514,26 +514,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "წავშალოთ მოძველებული პაკეტები?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_შენარჩუნება"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_წაშლა"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -541,45 +541,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "საჭირო დამოკიდებულებები არ არის დაყენებული"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "საჭირო დამოკიდებულება '%s' არ არის დაყენებული. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "პაკეტების მოურავის შემოწმება"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "შეცდომა განახლების მომზადებისას"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "შეცდომა განახლების რეკვიზიტების მომზადებისას"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -587,7 +587,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -596,23 +596,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "რეპოზიტორიის ინფორმაციის განახლება"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ინფორმაცია პაკეტის შესახებ არასწორია"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -624,40 +624,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "ჩამოტვირთვა"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "მიმდინარეობს განახლება"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "განახლება დასრულებულია"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "მოძველებული პროდუქტების ძებნა"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "სისტემის განახლება დასრულებულია."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -686,43 +686,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "განახლების პროგრამა ვერ გაიშვა"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "განახლების პროგრამის ხელმოწერა"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "განახლების პროგრამა"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "მიღება ვერ მოხერხდა"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "ვერ მოხერხდა განახლების მიღება. შესაძლოა ქსელის პრობლემა იყოს. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "აუთენტიფიკაცია ვერ მოხერხდა"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -730,11 +730,11 @@
"განახლების აუთენტიფიკაცია ვერ მოხერხდა. შესაძლოა ქსელის ან სერვერის პრობლემა "
"იყოს. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "განარქივება ვერ განხორციელდა"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -742,11 +742,11 @@
"განახლების განარქივება ვერ განხორციელდა. შესაძლოა ქსელის ან სერვერის "
"პრობლემა იყოს. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -754,18 +754,18 @@
"განახლების შეჯერება წარუმატებლად დამთავრდა. შესაძლოა პრობლემა ქსელის ან "
"სერვერის მიერ არის გამოწვეული. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -859,11 +859,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -871,11 +871,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -883,11 +883,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -897,11 +897,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1594,12 +1594,12 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"შეამოწმება, არის თუ არა შესაძლებელი ბოლო განვითარებად გამოცემაზე გადასვლა"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "სწადეთ განაახლოთ $distro-proposed -ზე"
@@ -1670,20 +1670,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/kk.po ubuntu-release-upgrader-17.10.1/po/kk.po
--- ubuntu-release-upgrader-17.04.7/po/kk.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/kk.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: kk\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s үшін сервер"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Негізгі сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Өзіңіздің серверлеріңіз"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list элементін санау мүмкін емес"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Пакеттер файлдарын табу мүмкін емес, мүмкін бұл Ubuntu дистрибутивының "
"дискісі да емес, немесе бұрыс сәулетті диск шығар?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD дискі қосу сәтсіз аяқталды"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,12 +69,12 @@
"Қате туралы мәлімдеме:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Қате етіп белгіленген пакетті жою"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -91,15 +91,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Мүмкін сервер асыра тиелген"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Бұзылған пакеттер"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -109,7 +109,7 @@
"біреуінің көмегімен жөндеңіз."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -120,25 +120,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Мүмкін бұл уақытша мәселе, кейінірек тағы байқап көріңіз."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Жүйенің жаңартуын есептеу мүмкін емес"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Кейбір пакеттердің растығын тексеру кезінде қате туындады"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -148,7 +148,7 @@
"уақытты мәселе, кейінірек тағы қайталап көріңіз. Төменде шынайлығы тексеріле "
"алынбаған пакеттер тізімі көрсетілген."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -156,33 +156,33 @@
"\"%s\" пакеті жойылуға тиісті етіп белгіленген, бірақ ол жойылуға тыйым "
"салынған тізімде."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "\"%s\" негізгі пакеті жойылуға тиісті етіп белгіленген."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Қара тізімге кірістірілген '%s' нұсқасының орнатылу мүмкіндігі орындалуда"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "\"%s\" орнату мүмкін емес"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Мета-пакетті теріп алынбады"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -481,7 +481,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Өзгертулерді есептеу"
@@ -503,7 +503,7 @@
"кейінірек жалғастыруыңызға болады."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Жаңартуларды жүктеу мүмкін емес"
@@ -518,27 +518,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Іске асыру кезінде қате туындады"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Жүйені бастапқы қалпына келтіру"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Жаңартуларды орнату мүмкін емес"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -546,7 +546,7 @@
"Жаңарту үзілді. Сіздің жүйеңіз бұзылып, қолдануға жарамсыз болуы мүмкін. "
"Қазір қайта қалпына келтіру үрдісі орындалатын болады (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -557,7 +557,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -565,20 +565,20 @@
"Жаңарту үзілді. Интернетпен қосылысыңызды не орнатушы дискісін тексеріңіз "
"де, жаңартуды қайтадан орындап көріңіз. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ескірген пакеттерді жою қажет пе?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Қалдыру"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Жою"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -587,45 +587,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Қажетті тәуелділіктер орнатылмаған"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Қажетті \"%s\" тәуелділігі орнатылмаған. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Пакеттер менеджері тексеру"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Жаңартуға дайындық сәтсіз аяқталды"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Жаңартуға дайындық сәтсіз аяқталды"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -633,7 +633,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -642,23 +642,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Репозиторий туралы ақпаратын жаңарту"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Дискті қосу сәтсіз аяқталды"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Кешіріңіз, дискті қосу сәтсіз аяқталды."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Пакет туралы дұрыс емес ақпарат"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -670,40 +670,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Жүктелу"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Жаңартылу"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Жаңарту аяқталды"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Жаңарту аяқталды, бірақ жаңарту кезінде қателер пайда болды."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Ескерген бағдарламаларды іздеу"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Жүйенің жаңартылуы аяқталды."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Жарым-жартылай жаңарту аяқталды."
@@ -732,44 +732,44 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Жаңарту құралын ашу мүмкін емес"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Жаңарту құралын баспасы"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Жаңарту құралы"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Алу мүмкін емес"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Жаңартуларды алу мүмкін сәтсіз аяқталды. Желілік мәселелер болуы мүмкін. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Аутентификация сәтсіз"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -777,11 +777,11 @@
"жаңартулардың шынайлығын растау сәтсіз аяқталды. Желімен не сервермен "
"мәселелер болуы мүмкін. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Шығарып алу (извлечь) сәтсіз"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -789,23 +789,23 @@
"Жаңартуларды шығарып алу сәтсіз аяқталды. Желімен не сервермен мәселелер "
"болуы мүмкін. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Тексеріліс сәтсіз"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Тексеріліс сәтсіз аяқталды. Желімен не сервермен мәселелер болуы мүмкін. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Жаңарту процессін ашу мүмкін емес"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -814,7 +814,7 @@
"болады. Нүктені noexec параметрсіз қайта тіркеңіз де, қайтадан жаңартып "
"көріңіз."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Қате туралы хабарлама \"%s\"."
@@ -915,11 +915,11 @@
"\n"
"Жалғастыру қажет пе?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 сәулетімен үйлесімді орталық процессор жоқ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -931,11 +931,11 @@
"сәулетімен үйлесімді орталық процессорлармен тиімді жұмыс істеу үшін етіп "
"жиналған."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 орталық процессоры (CPU) жоқ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -947,11 +947,11 @@
"сәулеттерге арналып қалыпқа келтірілген. Ағымдағы құралдар жабдықтармен, "
"жүйеңізді Ubuntu жаңа релизіне дейін жаңарту мүмкін емес."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init қызметі жетімсіз"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -967,11 +967,11 @@
"\n"
"Жалғастыруды қалайсыз ба?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1683,12 +1683,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Дистрибутивті жаңарту құралы жүктелуде"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Дистрибутивтің соңғы тұрақсыз үлгісіне дейін жаңарту мүмкіндігін тексеру"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1768,20 +1768,22 @@
msgstr ""
"Сол релизге дейін жаңартылу үшін \"do-release-upgrade\" командасын орындаңыз."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s жаңартуы жетімді"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Сіз Ubuntu-ды %s дейін жаңартуды кері қайтардыңыз"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/km.po ubuntu-release-upgrader-17.10.1/po/km.po
--- ubuntu-release-upgrader-17.04.7/po/km.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/km.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,13 +16,13 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
"X-Language: km-KH\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "ម៉ាស៊ីនមេសម្រាប់ %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ម៉ាស៊ីនមេចម្បង"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "ម៉ាស៊ីនមេផ្ទាល់ខ្លួន"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "មិនអាចគណនាធាតុ sources.list បានឡើយ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"មិនអាចរកឃើញទីតាំងឯកសារកញ្ចប់ណាមួយឡើយ "
"ប្រហែលវាមិនមែនជាថាសអ៊ូប៊ុនទូ ឬស្ថាបត្យកម្មដែលត្រឹមត្រូវទេ ?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "បានបរាជ័យក្នុងការបន្ថែមស៊ីឌី"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,12 +70,12 @@
"សារកំហុសគឺ ៖\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "យកកញ្ចប់ដែលស្ថិតក្នុងស្ថានភាពមិនត្រឹមត្រូវចេញ"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -92,15 +92,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "ម៉ាស៊ីនបម្រើអាចនឹងផ្ទុកលើស"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "កញ្ចប់ខូច"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -110,7 +110,7 @@
"ដោយប្រើ synaptic ឬ apt-get មុននឹងបន្ត ។"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -128,12 +128,12 @@
" * កញ្ចប់កម្មវិធីមិនផ្លូវការមិនត្រូវបានផ្ដល់ដោយអ៊ូប៊ុនទូ\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"វាអាចនឹងជាបញ្ហាបណ្ដោះអាសន្នប៉ុណ្ណោះ សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ ។"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -142,15 +142,15 @@
"បន្ទាប់សូមរាយការណ៍កំហុសដោយប្រើពាក្យបញ្ជាក់ 'ubuntu-bug ubuntu-release-"
"upgrader-core' នៅក្នុងស្ថានីយ។"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "មិនអាចគណនាការធ្វើឲ្យប្រសើរបានឡើយ"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "កំហុសការផ្ទៀងផ្ទាត់កញ្ចប់មួយចំនួន"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -162,7 +162,7 @@
"សូមមើលខាងក្រោមនេះសម្រាប់បញ្ជីបញ្ចប់ដែលពុំទាន់បានផ្ទៀងផ្ទាត់ភាពត្"
"រឹមត្រូវ ។"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -170,22 +170,22 @@
"កញ្ចប់ '%s' ត្រូវបានសម្គាល់សម្រាប់ការយកចេញ "
"ប៉ុន្តែវាស្ថិតនៅក្នុងបញ្ជីខ្មៅ ។"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "កញ្ចប់ដែលចាំបាច់ '%s' ត្រូវបានសម្គាល់សម្រាប់ការយកចេញ ។"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "សាកល្បងដំឡើងកំណែក្នុងបញ្ជីខ្មៅ '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "មិនអាចដំឡើង '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -193,11 +193,11 @@
"វាមិនអាចដំឡើងកញ្ចប់ដែលទាមទារបានទេ។ សូមរាយការណ៍កំហុសដោយប្រើ "
"'ubuntu-bug ubuntu-release-upgrader-core' នៅក្នុងស្ថានីយ។"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "មិនអាចទាញកញ្ចប់មេតាបានទេ"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -534,7 +534,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "គណនាការផ្លាស់ប្ដូរ"
@@ -557,7 +557,7 @@
"អ្នកអាចបន្តការធ្វើឲ្យប្រសើរនៅពេលក្រោយបាន ។"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "មិនអាចទាញយកការធ្វើឲ្យប្រសើរបានឡើយ"
@@ -572,27 +572,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "កំហុសក្នុងអំឡុងពេលប្រតិបត្តិ"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "ស្ដារស្ថានភាពប្រព័ន្ធលំនាំដើម"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "មិនអាចដំឡើងការធ្វើឲ្យប្រសើរ"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -601,7 +601,7 @@
"ប្រព័ន្ធរបស់អ្នកអាចស្ថិតនៅក្នុងស្ថានភាពមិនអាចប្រើបាន ។ "
"ការសង្គ្រោះនឹងដំណើរការឥឡូវនេះ (dpkg --configure -a) ។"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -618,7 +618,7 @@
"and attach the files in /var/log/dist-upgrade/ to the bug report.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -626,20 +626,20 @@
"ការធ្វើឲ្យប្រសើរបានបោះបង់ ។ សូមពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិត "
"ឬមេឌៀដំឡើងរបស់អ្នក រួចព្យាយាមម្ដងទៀត ។ "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "លុបកញ្ចប់ផុតសម័យចេញ?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "រក្សាទុក"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "លុបចេញ"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -649,28 +649,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "ភាពអាស្រ័យដែលបានទាមទារមិនត្រូវបានដំឡើង"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "ភាពអាស្រ័យដែលបានទាមទារ '%s' មិនត្រូវបានដំឡើង ។ "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "ពិនិត្យមើលកម្មវិធីគ្រប់គ្រងកញ្ចប់"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "បានបរាជ័យក្នុងការរៀបចំធ្វើបច្ចុប្បន្នភាព"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -678,7 +678,7 @@
"រៀបចំប្រព័ន្ធ សម្រាប់ការធ្វើឲ្យប្រសើរឡើងបានបរាជ័យ "
"ដូច្នេះដំណើរការរាយការណ៍កំហុសកំពុងត្រូវបានចាប់ផ្ដើម ។"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -687,13 +687,13 @@
"ដើម្បីរាយការណ៍កំហុសការដំឡើង apport ហើយបន្ទាប់មកអនុវត្ត 'apport-bug "
"ubuntu-release-upgrader' ។"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
"បានបរាជ័យក្នុងការទទួលយកតម្រូវការជាមុនសម្រាប់ការធ្វើឲ្យប្រសើរ"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -706,7 +706,7 @@
"\n"
"លើសពីនេះ ដំណើរការរាយការណ៍កំហុសកំពុងត្រូវបានចាប់ផ្ដើម ។"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -721,23 +721,23 @@
"ដើម្បីរាយការណ៍កំហុសការដំឡើង apport ហើយបន្ទាប់មកអនុវត្ត 'apport-bug "
"ubuntu-release-upgrader' ។"
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "កំពុងធ្វើបច្ចុប្បន្នភាពព័ត៌មានឃ្លាំង"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "បានបរាជ័យក្នុងការបន្ថែម cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "សូមអភ័យទោស ការបន្ថែម cdrom មិនទទួលជោគជ័យទេ ។"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ព័ត៌មានកញ្ចប់មិនត្រឹមត្រូវ"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -757,42 +757,42 @@
"នៅក្នុងនៃកញ្ចក់ដែលបានផ្ទុកនៅលើ "
"អ្នកអាចព្យាយាមធ្វើបច្ចុប្បន្នភាពម្ដងទៀតពេលក្រោយ។"
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "ទៅប្រមូលយក"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "ធ្វើឲ្យប្រសើរ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "បានបញ្ចប់ការធ្វើឲ្យប្រសើរ"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"បានបញ្ចប់ការធ្វើឲ្យប្រសើរ "
"ប៉ុន្តែមានកំហុសក្នុងអំឡុងពេលធ្វើឲ្យប្រសើរឡើង ។"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "ស្វែងរកកម្មវិធីដែលហូសសម័យ"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "បានបញ្ចប់ការធ្វើឲ្យប្រព័ន្ធប្រសើរ ។"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "បានបញ្ចប់ការធ្វើឲ្យប្រសើរដោយផ្នែក ។"
@@ -821,17 +821,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "ផ្ទៀងផ្ទាត់ភាព '%(file)s' ទល់នឹង '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "ស្រង់ចេញ '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "មិនអាចដំណើរការឧបករណ៍ធ្វើឲ្យប្រសើរទេ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -840,29 +840,29 @@
"សូមរាយការណ៍កំហុសដោយប្រើពាក្យបញ្ជា 'ubuntu-bug ubuntu-release-upgrader-"
"core' ។"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "ហត្ថលេខាឧបករណ៍ធ្វើឲ្យប្រសើរ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "ឧបករណ៍ធ្វើឲ្យប្រសើរ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "បានបរាជ័យក្នុងការទៅប្រមូលយក"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"បានបរាជ័យក្នុងការទៅប្រមូលយកការធ្វើឲ្យប្រសើរ ។ អាចមានបញ្ហាបណ្ដាញ "
"។ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "បានបរាជ័យក្នុងការផ្ទៀងផ្ទាត់"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -870,11 +870,11 @@
"បានបរាជ័យក្នុងការផ្ទៀងផ្ទាត់ភាពអំពីការធ្វើឲ្យប្រសើរ ។ "
"អាចមានបញ្ហាជាមួយបណ្ដាញ ឬជាមួយម៉ាស៊ីនមេ ។ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "បានបរាជ័យក្នុងការស្រង់ចេញ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -882,11 +882,11 @@
"បានបរាជ័យក្នុងការស្រង់ចេញការធ្វើឲ្យប្រសើរ ។ "
"អាចមានបញ្ហាជាមួយបណ្ដាញ ឬជាមួយម៉ាស៊ីនមេ ។ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "បានបរាជ័យក្នុងការផ្ទៀងផ្ទាត់"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -894,12 +894,12 @@
"បានបរាជ័យក្នុងការផ្ទៀងផ្ទាត់ការធ្វើឲ្យប្រសើរ ។ "
"អាចមានបញ្ហាជាមួយបណ្ដាញ ឬជាមួយម៉ាស៊ីនបម្រើ ។ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "មិនអាចដំណើរការការធ្វើឲ្យប្រសើរបានទេ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -908,7 +908,7 @@
"noexec ។ សូមម៉ោនឡើងវិញដោយមិនប្រើ noexec "
"រួចដំណើរការការធ្វើឲ្យប្រសើរម្ដងទៀត ។"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "សារកំហុសគឺ '%s' ។"
@@ -1025,11 +1025,11 @@
"\n"
"តើអ្នកចង់បន្តដែរឬទេ ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "គ្មានស៊ីភីយូ i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1042,11 +1042,11 @@
"អ្នកមិនអាចធ្វើឲ្យប្រព័ន្ធរបស់អ្នកប្រសើរទៅជាកំណែចេញផ្សាយអ៊ូប៊ុនទូថ"
"្មីដោយប្រើផ្នែករឹងនេះបានឡើយ ។"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "គ្មានស៊ីភីយូ ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1060,11 +1060,11 @@
"អ្នកមិនអាចធ្វើឲ្យប្រព័ន្ធរបស់អ្នកប្រសើរទៅជាកំណែចេញផ្សាយអ៊ូប៊ុនទូ"
"ថ្មីដោយប្រើផ្នែករឹងនេះបានឡើយ ។"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "គ្មាន init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1081,11 +1081,11 @@
"\n"
"តើអ្នកចង់បន្តទេ ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "បានបិទ PAE"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1821,13 +1821,13 @@
msgid "Downloading the release upgrade tool"
msgstr "ទាញយកឧបករណ៍ធ្វើឲ្យការចេញផ្សាយប្រសើរឡើង"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"ពិនិត្យមើលថាតើការធ្វើឲ្យប្រសើរចំពោះឯកសារចេញផ្សាយ devel "
"ចុងក្រោយអាចធ្វើបានដែរឬទេ"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1909,20 +1909,22 @@
msgstr ""
"ប្រើពាក្យបញ្ជា 'do-release-upgrade' ដើម្បីធ្វើឲ្យប្រសើរចំពោះវា ។"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "កម្មវិធីធ្វើបច្ចុប្បន្នភាពកម្មវិធី"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "ការធ្វើឲ្យប្រសើរ %(version)s អ៊ូប៊ុនទូអាចប្រើបាន"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "អ្នកបានបដិសេធការធ្វើឲ្យប្រសើរទៅអ៊ូប៊ុនទូ %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "បន្ថែមទិន្នន័យបំបាត់កំហុស"
diff -Nru ubuntu-release-upgrader-17.04.7/po/kn.po ubuntu-release-upgrader-17.10.1/po/kn.po
--- ubuntu-release-upgrader-17.04.7/po/kn.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/kn.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: kn\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s ಗಾಗಿ ಸರ್ವರ್"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ಮುಖ್ಯ ಸರ್ವರ್"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "ವಿಶೇಷ ಸರ್ವರ್ ಗಳು"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "server.list ಅನ್ನು ಲೆಕ್ಕ ಹಾಕಲಾಗಲಿಲ್ಲ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "ಸಿಡಿಯನ್ನು ಸೇರಿಸಲು ವಿಫಲವಾಗಿದೆ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "ಅಸಮಂಜಸ ಸ್ಥಿತಿಯಲ್ಲಿರುವ ಪ್ಬಾಕೇಜನ್ನು ತೆಗೆದುಹಾಕು"
msgstr[1] "ಅಸಮಂಜಸ ಸ್ಥಿತಿಯಲ್ಲಿರುವ ಪ್ಬಾಕೇಜ್ ಗಳನ್ನು ತೆಗೆದುಹಾಕು"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,15 +82,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "ಮುರಿದುಹೋದ ಪ್ಯಾಕೇಜ್ ಗಳು"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -99,7 +99,7 @@
"ಮುಂದುವರೆಯುವ ಮುನ್ನ ಮೊದಲು, ಇವನ್ನು synaptic ಅಥವಾ apt-get ಬಳಸಿ ಸರಿ ಪಡಿಸಿರಿ."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -110,11 +110,11 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "ಈ ತೊಂದರೆ ಬಹುತೇಕ ಕ್ಷಣಿಕವಾದದ್ದು, ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -122,53 +122,53 @@
"ಇದಾವುದೂ ಅನ್ವಯವಾಗದಿದ್ದಲ್ಲಿ, ದಯವಿಟ್ಟು ಈ ತೊಂದರೆಯನ್ನು, ಟರ್ಮಿನಲ್ ನಲ್ಲಿ 'ubuntu-"
"bug ubuntu-release-upgrader-core' - ಈ ಆದೇಶವನ್ನು ಉಪಯೋಗಿಸಿ, ವರದಿ ಮಾಡಿ."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'ನ್ನು ಸಂಸ್ಥಾಪಿಸಲು ಆಗುವುದಿಲ್ಲ"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -419,7 +419,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -439,7 +439,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -451,33 +451,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -488,26 +488,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -515,45 +515,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -561,7 +561,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -570,23 +570,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -598,40 +598,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -660,80 +660,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -827,11 +827,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -839,11 +839,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -851,11 +851,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -865,11 +865,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1544,11 +1544,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1616,19 +1616,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ko.po ubuntu-release-upgrader-17.10.1/po/ko.po
--- ubuntu-release-upgrader-17.04.7/po/ko.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ko.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ko\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s 서버"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "주 서버"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "사용자 정의 서버"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list 항목을 계산할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "어떤 패키지 파일도 찾을 수 없습니다. 우분투 디스크가 아니거나 올바르지 않은 아키텍처인 것은 아닙니까?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD 추가 실패"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -65,12 +65,12 @@
"오류 메시지:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "오류가 있는 패키지 제거"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -85,22 +85,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "서버가 과부화 상태인 것 같습니다"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "망가진 패키지"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr "이 소프트웨어로 고칠 수 없는 망가진 패키지가 있습니다. 진행하기 전에 시냅틱이나 apt-get 명령으로 복구하십시오."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -118,11 +118,11 @@
"* 우분투가 제공하지 않는 비공식의 소프트웨어 패키지를 설치하는 경우\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "이것은 아마도 일시적인 문제일 것입니다. 나중에 다시 시도해주십시오."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -130,15 +130,15 @@
"이 중 어떤 것도 적용할 수 없는 경우에는 터미널에서 'ubuntu-bug ubuntu-release-upgrader-core' 명령을 "
"사용해 버그를 보고해주십시오."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "업그레이드를 계산할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "일부 패키지를 인증할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -147,28 +147,28 @@
"몇몇 패키지를 인증할 수 없습니다. 일시적인 네트워크 문제일 수 있으므로 나중에 대시 시도해주십시오. 인증하지 못한 패키지의 목록은 "
"다음과 같습니다."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "패키지 '%s'은(는) 제거 차단 목록에 기록되어 있어 제거할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "필수 패키지 '%s'을(를) 제거할 항목으로 표시했습니다."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "차단 목록 상의 버전 '%s'을(를) 설치합니다"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'을(를) 설치할 수 없음"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -176,11 +176,11 @@
"필요한 패키지를 설치할 수 없습니다. 터미널에서 'ubuntu-bug ubuntu-release-upgrader-core' 명령을 사용해 "
"버그를 보고해주십시오."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "메타 패키지를 추측할 수 없음"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -474,7 +474,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "바뀐 내용을 계산하는 중"
@@ -494,7 +494,7 @@
msgstr "업그레이드를 취소합니다. 시스템은 업그레이드 이전 상태로 돌아가며 업그레이드는 이후에도 언제든지 다시 할 수 있습니다."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "업그레이드 파일을 다운로드 할 수 없음"
@@ -506,27 +506,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "커밋 작업 중 오류 발생"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "시스템을 이전의 상태로 복구하고 있습니다"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "업그레이드를 설치하지 못했습니다."
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -534,7 +534,7 @@
"업그레이드를 중단했습니다. 시스템에 치명적인 오류가 발생했을 수 있습니다. 복구(dpkg --configure -a) 명령을 "
"실행하겠습니다."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -551,26 +551,26 @@
"버그를 보고해주십시오.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr "업그레이드를 중단했습니다. 인터넷 연결이나 설치 매체를 확인한 후 다시 시도하십시오. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "사용하지 못하게 된 패키지를 제거하시겠습니까?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "유지(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "제거(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -578,34 +578,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "필요한 의존 프로그램을 설치하지 않았습니다."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "필요한 의존 프로그램 '%s'을(를) 설치하지 않습니다. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "패키지 관리자 확인 중"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "업그레이드 준비에 실패했습니다"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "시스템 업그레이드 준비를 실패했습니다. 버그 보고 작업을 시작합니다."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -613,12 +613,12 @@
"업그레이드에 실패한 시스템을 준비하는 중입니다. 버그를 보고하시려면 'apport'라는 프로그램을 설치한 후 'apport-bug "
"ubuntu-release-upgrader' 명령을 실행해주십시오."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "업그레이드 사전 작업에 실패했습니다"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -629,7 +629,7 @@
"\n"
"추가적으로, 버그 보고 작업을 시작합니다."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -642,23 +642,23 @@
"버그를 보고하시려면 'apport'라는 프로그램을 설치한 후 'apport-bug ubuntu-release-upgrader' 명령을 "
"실행해주십시오."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "저장소 정보 업데이트 중"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "cdrom을 추가할 수 없음"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "죄송합니다. cdrom을 추사할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "올바르지 않은 패키지 정보"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -674,40 +674,40 @@
"있습니다.\n"
"과도한 부하로 인해 발생한 경우에는 잠시 후 다시 업그레이드를 시작해주십시오."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "가져오는 중"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "업그레이드 중"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "업그레이드 완료"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "업그레이드를 완료했지만 업그레이드 과정 중 오류가 발생하였습니다."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "못 쓰게 된 소프트웨어를 검색하는 중"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "시스템 업그레이드를 완료했습니다."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "부분 업그레이드를 완료했습니다."
@@ -736,17 +736,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "'%(signature)s'(으)로 '%(file)s' 파일 인증 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' 압축 해제 중"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "업그레이드 도구를 실행할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -754,58 +754,58 @@
"이것은 업그레이드 도구의 버그일 가능성이 높습니다. 'ubuntu-bug ubuntu-release-upgrader-core' 명령을 "
"이용해 버그를 보고해 주십시오."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "업그레이드 도구 서명"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "업그레이드 도구"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "가져오기 실패"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "업그레이드를 가져올 수 없습니다. 네트워크에 문제가 있을 수 있습니다. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "인증 실패"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "업그레이드를 인증할 수 없습니다. 네트워크나 서버에 문제가 있을 수 있습니다. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "압축 해제 실패"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "업그레이드의 압축을 해제할 수 없습니다. 네트워크나 서버에 문제가 있을 수 있습니다. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "검증 실패"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "업그레이드를 검증할 수 없습니다. 네트워크나 서버에 문제가 있을 수 있습니다. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "업그레이드를 할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -813,7 +813,7 @@
"이 것은 보통 /tmp 디렉터리를 noexec로 마운트한 시스템에서 발생합니다. noexec 없이 다시 마운트한 후 업그레이드를 "
"시작하십시오."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "오류 메시지는 '%s'입니다."
@@ -917,11 +917,11 @@
"없습니다.\n"
"계속 진행하시겠습니까?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 CPU 아님"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -931,11 +931,11 @@
"현 시스템은 i586 호환 CPU가 아니거나, 'cmov' 기능이 없는 CPU를 사용하고 있습니다. 모든 패키지는 최소 i686 호환 "
"CPU가 필요합니다. 현 시스템에서 새로운 우분투 버전으로 업그레이드 할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 CPU 아님"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -945,11 +945,11 @@
"시스템이 ARMv6 보다 더 오래된 아키텍처의 ARM CPU를 사용하고 있습니다. 우분투 karmic의 모든 꾸러미는 ARMv6에 최적화 "
"되어있기 때문에 최소 CPU로 ARMv6이 필요합니다. 현재 하드웨어로는 새로운 우분투 버전으로 시스템을 업그레이드 할 수 없습니다."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init 사용 불가"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -963,11 +963,11 @@
"\n"
"계속 진행하시겠습니까?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE 기능을 사용하지 않고 있습니다."
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1662,11 +1662,11 @@
msgid "Downloading the release upgrade tool"
msgstr "배포판 업그레이드 도구 다운로드 중"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "최신 개발 버전으로 업그레이드할 수 있는지 확인합니다"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "업그레이드 도구를 이용하여 $distro-proposed에서 최신 배포판으로 업그레이드를 시도합니다"
@@ -1738,20 +1738,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "업그레이드를 하시려면 'do-release-upgrade' 명령을 실행하세요."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "소프트웨어 업데이트 도구"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "우분투 %(version)s(으)로 업그레이드할 수 있습니다."
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "우분투 %s(으)로 업그레이드하는 것을 취소했습니다."
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "디버그 출력 추가"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ku.po ubuntu-release-upgrader-17.10.1/po/ku.po
--- ubuntu-release-upgrader-17.04.7/po/ku.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ku.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ku\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Pêşkêşkera %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Pêşkêşkera Mak"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Pêşkêşkera taybet"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Hesibandina ketana sources.list biserneket"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Tu pelên pakêtan nayên bicîkirin, pêkan e ku ev ne Diskeke Ubuntuyê be an jî "
"avabûneke çewt be?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Di têxistina CD'yê de çewtî"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Peyama çewtiyê:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Pakêta di rewşa nebaş de rake"
msgstr[1] "Pakêtên di rewşa nebaş de rake"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -93,15 +93,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Dibe ku li ser pêşkêşkarê pir hatibe barkirin"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pakêtên şikestî"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -111,7 +111,7 @@
"synaptic an jî i apt-getê sererast bike."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -122,25 +122,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ev wekî pirsgirêkeke demdemî xuya dike, tika ye dîsa biceribîne."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Bilindkirin nehat hesabkirin"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Di piştrastkirina çend paketan de çewtî derket"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -149,7 +149,7 @@
"Hin pakêt nehatin piştrastkirin. Dibe ku ev pirsgirêkeke derbasdar a torê "
"be. Ji bo lîsteya pakêtên ku nehatine piştrastkirin li jêr binihêre."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -157,32 +157,32 @@
"Pakêta '%s' ji bo rakirinê hate nîşankirin lê di lîsteya reş a rakirinê de "
"ye."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Pakêta bingehîn '%s' ji bo rakirinê hate nîşankirin."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Sazkirina guhertoya '%s' a lîsteya reş diceribîne"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nikare '%s' saz bike"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Pakêta meta nehate texmînkirin"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -441,7 +441,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Guherandin tê hesibandin"
@@ -461,7 +461,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Daxistina bilindkirinan bi ser neket"
@@ -473,33 +473,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Çewtî di dema xebitandinê de"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Vedigere rewşa pergala orjînal"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Sazkirina bilindkirinan bi ser neket"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -510,26 +510,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Bila pakêtên ku nayên bikaranîn werin rakirin?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "Bi_parêze"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Jêbirin"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -537,45 +537,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Divêtiyên pêwîst ne barkirî ne"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Divêtiya pêwîst '%s' ne barkirî ye "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Rêvebiriya paketan tê kontrol kirin"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Amadekirinên nûjenkirinê bi ser neketin"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Amadekirinên bilindkirinê bi ser neketin"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -583,7 +583,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -592,23 +592,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Agahiyên çavkaniyan tên rojanekirin"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Agahiya pakêtê nederbasdar e"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -620,40 +620,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Tê daxistin"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Tê bilindkirin"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Bilindkirin temam bû"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Li nivîsbariya kevin tê gerandin"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Bilindkirina pergalê temam bû."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -682,54 +682,54 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Amûra bilindkirinê nikaribû bimeşîne"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Destnîşana amûra bilindkirinê"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Amûra bilindkirinê"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Anîn biserneket"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Anîna bilindkirinê biserneket. Dibe ku pirsgirêkeke torê hebe. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Naskirin lê nehat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"Naskirina bilindkirnê lê nehat. Dibe ku pirsgirekeke tor an pêşkêşkarê hebe. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Derxistin biserneket"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -737,11 +737,11 @@
"Derxistina bilindkirinê biserneket. Dibe ku pirsgirekeke tor an pêşkêşkarê "
"hebe. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -749,18 +749,18 @@
"Di dema erêkirina bilindkirinê de çewtî. Dibe ku yan di torê de yan jî di "
"pêşkêşkerê de pirsgirêk hebe "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Bilindkirin nayê xebitandin"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Peyama çewtiyê '%s' e."
@@ -771,7 +771,7 @@
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:142
msgid "&Cancel"
-msgstr ""
+msgstr "&Betal"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:144
#: ../data/gtkbuilder/ReleaseNotes.ui.h:1
@@ -780,22 +780,22 @@
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:201
msgid "Upgrade"
-msgstr ""
+msgstr "Bilind bike"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:217
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:232
msgid "Downloading additional package files..."
-msgstr ""
+msgstr "Paketên pêvek tên daxistin..."
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:234
#, python-format
msgid "File %s of %s at %sB/s"
-msgstr ""
+msgstr "Pelê %s ji %s bi %s/ç"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:238
#, python-format
msgid "File %s of %s"
-msgstr ""
+msgstr "Pelê %s ji %s"
#. print("mediaChange %s %s" % (medium, drive))
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:245
@@ -854,11 +854,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -866,11 +866,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "CPU ya ARMv6 tune"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -878,11 +878,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -892,11 +892,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1538,7 +1538,7 @@
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3
msgid "Ask Me Later"
-msgstr ""
+msgstr "min Paşê bipirse"
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4
msgid "Yes, Upgrade Now"
@@ -1590,12 +1590,12 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Kontrol bike ma bilindkirina bi weşana pêşdebiran ya dawî gengaz e an na"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1663,20 +1663,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ky.po ubuntu-release-upgrader-17.10.1/po/ky.po
--- ubuntu-release-upgrader-17.04.7/po/ky.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ky.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ky\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/lb.po ubuntu-release-upgrader-17.10.1/po/lb.po
--- ubuntu-release-upgrader-17.04.7/po/lb.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/lb.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server fir %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Haaptserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Benotzerdefinéierten Server"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Et wor net méiglech ee Pak ze fannen, villäicht ass dëst keng Ubuntu CD oder "
"et ass di falsch Architektur."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "D'CD konnt net bäigefügt ginn"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"D'Fehlermeldung wor:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Feelerhafte Pak läschen"
msgstr[1] "Feelerhaft Päck läschen"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -93,15 +93,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "De Server kéint iwwerlaascht sinn"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Defekt Päck"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -110,7 +110,7 @@
"ginn. W.e.g. fléckt dës mat synaptic oder apt-get iert Dir virufuert."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -121,65 +121,65 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Dëst ass héchstwahrscheinlech ee kuerzzäitege Problem, probéiert w.e.g. "
"spéider nach eng Kéier."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -430,7 +430,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -450,7 +450,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -462,33 +462,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -499,26 +499,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -526,45 +526,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -572,7 +572,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -581,23 +581,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -609,40 +609,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -671,80 +671,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -838,11 +838,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -850,11 +850,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -862,11 +862,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -876,11 +876,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1555,11 +1555,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1627,19 +1627,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ln.po ubuntu-release-upgrader-17.10.1/po/ln.po
--- ubuntu-release-upgrader-17.04.7/po/ln.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ln.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,11 +15,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -27,30 +27,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -60,13 +60,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -81,22 +81,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -107,63 +107,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -414,7 +414,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -434,7 +434,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -446,33 +446,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -483,26 +483,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -510,45 +510,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -556,7 +556,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -565,23 +565,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -593,40 +593,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -655,80 +655,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -822,11 +822,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -834,11 +834,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -846,11 +846,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -860,11 +860,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1539,11 +1539,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1611,19 +1611,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/lo.po ubuntu-release-upgrader-17.10.1/po/lo.po
--- ubuntu-release-upgrader-17.04.7/po/lo.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/lo.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/lt.po ubuntu-release-upgrader-17.10.1/po/lt.po
--- ubuntu-release-upgrader-17.04.7/po/lt.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/lt.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: lt\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s serveris"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Pagrindinis serveris"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Pasirinktiniai serveriai"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nepavyko apskaičiuoti sources.list įrašo"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Nepavyko rasti jokių paketų failų, galbūt tai ne Ubuntu diskas arba ne ta "
"architektūra?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Nepavyko įtraukti CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Klaidos pranešimas:\n"
"„%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Pašalinti paketą blogoje būsenoje"
msgstr[1] "Pašalinti paketus blogoje būsenoje"
msgstr[2] "Pašalinti paketą blogoje būsenoje"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -98,15 +98,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Serveris gali būti labai apkrautas"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Sugadinti paketai"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -116,7 +116,7 @@
"arba „apt-get“."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -127,11 +127,11 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Tai greičiausiai yra laikina problema, pabandykite vėliau dar kartą."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -139,15 +139,15 @@
"Jei niekas netinka, tada praneškite apie šią klaidą naudodami komandą "
"„ubuntu-bug ubuntu-release-upgrader-core“ terminale."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nepavyko apskaičiuoti atnaujinimo"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Klaida nustatant kai kurių paketų tapatybę"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -157,29 +157,29 @@
"problema. Galite pabandyti vėliau. Žemiau parodytas paketų, kurių tapatybė "
"nepatvirtinta, sąrašas."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Paketas „%s“ pažymėtas pašalinimui, tačiau jis yra juodajame šalinimo sąraše."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Esminis paketas „%s“ pažymėtas pašalinimui."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Bandoma įdiegti juodajame sąraše įtrauką versiją „%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Negalima įdiegti „%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -187,11 +187,11 @@
"Neįmanoma įdiegti reikalingo paketo. Praneškite apie šią klaidą naudodami "
"„ubuntu-bug ubuntu-release-upgrader-core“ terminale."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nepavyko atspėti metapaketo"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -506,7 +506,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Apskaičiuojami pakeitimai"
@@ -528,7 +528,7 @@
"Galite pratęsti atnaujinimą vėliau."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nepavyko atsiųsti atnaujinimų"
@@ -543,27 +543,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Klaida vykdant"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Atstatoma pradinė sistemos būsena"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nepavyko įdiegti atnaujinimų"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -571,7 +571,7 @@
"Atnaujinimas nutrauktas. Jūsų sistema gali būti netinkamoje naudoti "
"būsenoje. Dabar bus paleistas atkūrimas (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -589,7 +589,7 @@
"klaidą.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -597,20 +597,20 @@
"Atnaujinimas nutrauktas. Patikrinkite savo interneto ryšį ar diegimo "
"laikmeną ir bandykite dar kartą. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Pašalinti pasenusius paketus?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Palikti"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "P_ašalinti"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -620,28 +620,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Reikalaujamos priklausomybės neįdiegtos"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Reikalaujama priklausomybė „%s“ neįdiegta. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Tikrinama paketų tvarkyklė"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Nepavyko paruošti atnaujinimo"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -649,18 +649,18 @@
"Sistemos paruošimas atnaujinimui nepavyko, todėl paleidžiamas pranešimo apie "
"klaidą procesas."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Nepavyko gauti išankstinių atnaujinimo sąlygų"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -672,7 +672,7 @@
"\n"
"Papildomai paleidžiamas pranešimo apie klaidą procesas."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -681,23 +681,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Atnaujinama saugyklų informacija"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Nepavyko pridėti kompaktinio disko"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Atsiprašome, kompaktinio disko pridėjimas nesėkmingas."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Netinkama paketo informacija"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -709,40 +709,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Atsiunčiama"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Atnaujinama"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Atnaujinimas užbaigtas"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Atnaujinimas baigtas, bet atnaujinimo proceso metu įvyko klaidų."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Ieškoma pasenusios programinės įrangos"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistemos atnaujinimas baigtas."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Dalinis atnaujinimas baigtas."
@@ -771,17 +771,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "nustatyti „%(file)s“ tapatumą pagal „%(signature)s“ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "išskleidžiama „%s“"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nepavyko paleisti atnaujinimo įrankio"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -789,27 +789,27 @@
"Labiausiai tikėtina, kad tai klaida atnaujinimo įrankyje. Praneškite apie ją "
"naudodami komandą „ubuntu-bug ubuntu-release-upgrader-core“."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Atnaujinimo įrankio parašas"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Atnaujinimo įrankis"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Atsiųsti nepavyko"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Nepavyko gauti atnaujinimo. Tai gali būti tinklo problema. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Nepavyko nustatyti tapatybės"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -817,34 +817,34 @@
"Nepavyko nustatyti atnaujinimo tapatybės. Gali būti tinklo arba serverio "
"problema. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Nepavyko išpakuoti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Nepavyko išpakuoti atnaujinimo. Gali būti tinklo arba serverio problema. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Nepavyko patikrinti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Nepavyko patikrinti atnaujinimo. Tai gali būti ryšio arba serverio problema. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Negalima paleisti atnaujinimo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -853,7 +853,7 @@
"parametru. Prašau prijunkite iš naujo be „noexec“ parametro ir atnaujinkite "
"dar kartą."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Klaidos pranešimas yra „%s“."
@@ -966,11 +966,11 @@
"\n"
"Ar norite tęsti?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ne i686 CP"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -982,11 +982,11 @@
"architektūros. Su šia aparatine įranga neįmanoma atnaujinti jūsų sistemos į "
"naują Ubuntu laidą."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ne ARMv6 procesorius"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -998,11 +998,11 @@
"negu ARMv6 architektūra. Su šia aparatine įranga negalima atnaujinti jūsų "
"sistemos į naują Ubuntu laidą."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Neprieinamas init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1017,11 +1017,11 @@
"\n"
"Ar tikrai norite tęsti?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE neįjungtas"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1760,12 +1760,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Atsiunčiamas laidos atnaujinimo įrankis"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Patikrinti, ar galima atnaujinti iki naujausios dar neišleistos versijos."
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1843,20 +1843,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Norėdami atnaujinti į ją, paleiskite „do-release-upgrade“."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Programinės įrangos naujinimas"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Prieinamas Ubuntu %(version)s atnaujinimas"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Jūs atsisakėte atnaujinti į Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Pridėti derinimo išvedimą"
diff -Nru ubuntu-release-upgrader-17.04.7/po/lv.po ubuntu-release-upgrader-17.10.1/po/lv.po
--- ubuntu-release-upgrader-17.04.7/po/lv.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/lv.po 2017-04-24 21:05:20.000000000 +0000
@@ -18,12 +18,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: lv\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "% serveris"
@@ -31,20 +31,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Galvenais serveris"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Pielāgotie serveri"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Neizdevās aprēķināt sources.list ierakstu"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -52,11 +52,11 @@
"Neizdevās atrast pakotņu datnes. Varbūt šis nav Ubuntu disks, vai izvēlēta "
"nepareiza sistēmas arhitektūra?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Neizdevās pievienot CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -71,14 +71,14 @@
"Kļūdas paziņojums bija:\n"
"“%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Izņemt pakotni, kas ir sliktā stāvoklī"
msgstr[1] "Izņemt pakotnes, kas ir sliktā stāvoklī"
msgstr[2] "Izņemt pakotnes, kas ir sliktā stāvoklī"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -102,15 +102,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Iespējams, ka serveris ir pārslogots"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Bojātas pakotnes"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -119,7 +119,7 @@
"turpināt, lūdzu, salabojiet tās, izmantojot synaptic vai apt-get rīkus."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -137,11 +137,11 @@
" * Neoficiālas programmatūras pakotnes, kas nenāk no Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Šī, visdrīzāk, ir īslaicīga problēma. Lūdzu, mēģiniet vēlāk vēlreiz."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -149,15 +149,15 @@
"Ja no tā visa nekas nav attiecināms, lūdzu, ziņojiet par šo kļūdu, "
"izmantojot termināļa komandu “ubuntu-bug ubuntu-release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nevarēja aprēķināt uzlabojumu"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Kļūda, autentificējot dažas pakotnes"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -167,29 +167,29 @@
"problēma. Pamēģiniet atkārtot šo darbību vēlāk. Skatiet neautentificēto "
"pakotņu sarakstu zemāk."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Pakotne “%s” ir atzīmēta kā izņemama, bet tā ir izņemšanas melnajā sarakstā."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Būtiska pakotne “%s” ir atzīmēta izņemšanai."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Mēģina instalēt versiju “%s”, kas atrodas melnajā sarakstā"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Neizdodas instalēt “%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -197,11 +197,11 @@
"Nevarēja uzinstalēt vajadzīgās pakotnes. Lūdzu, ziņojiet par šo kļūdu, "
"izmantojot termināļa komandu “ubuntu-bug ubuntu-release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Neizdodas uzminēt meta-pakotni"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -527,7 +527,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Aprēķina izmaiņas"
@@ -549,7 +549,7 @@
"stāvoklis. Jūs varēsiet turpināt vēlāk."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Neizdevās lejupielādēt uzlabojumus"
@@ -564,27 +564,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Kļūda apstiprināšanas laikā"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Atjauno sākotnējo sistēmas stāvokli"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Neizdevās instalēt uzlabojumus"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -592,7 +592,7 @@
"Uzlabošana ir pārtraukta. Sistēma varētu būt nelietojamā stāvoklī. Tagad "
"tiks veikta atgūšanās (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -609,7 +609,7 @@
"kļūdas ziņojumam pievienojiet datnes no /var/log/dist-upgrade/.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -617,20 +617,20 @@
"Uzlabošana tika pārtraukta. Lūdzu, pārbaudiet savu Interneta savienojumu vai "
"instalēšanas datu nesēju un mēģiniet vēlreiz. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Vai aizvākt novecojušās pakotnes?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Paturēt"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Izņemt"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -640,28 +640,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Nav instalētās nepieciešamās atkarības"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Nav instalēta nepieciešamā atkarība “%s”. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Pārbauda pakotņu pārvaldnieku"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Neizdevās sagatavot uzlabošanu"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -669,7 +669,7 @@
"Sistēmas sagatavošana atjaunināšanai neizdevās, tāpēc tiek uzsākts kļūdu "
"ziņošanas process."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -678,12 +678,12 @@
"instalējiet apport un tad terminālī izpildiet 'apport-bug ubuntu-release-"
"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Neizdevās iegūt uzlabošanas priekšnosacījumus"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -695,7 +695,7 @@
"\n"
"Papildus tiek uzsākts kļūdu ziņošanas process."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -709,23 +709,23 @@
"Lai ziņotu par kļūdu instalējiet apport un tad terminālī izpildiet 'apport-"
"bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Atjaunina krātuvju informāciju"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Neizdevās pievienot cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Diemžēl neizdevās pievienot cdrom."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Nederīga informācija par pakotnēm"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -737,40 +737,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Iegūst"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Uzlabo"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Uzlabošana pabeigta"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Uzlabošana ir pabeigta, bet tās laikā bija kļūdas."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Meklē novecojušu programmatūru"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistēmas uzlabošana ir pabeigta."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Daļējā uzlabošana pabeigta."
@@ -799,17 +799,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autentificēt “%(file)s” ar “%(signature)s” "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "atarhivē “%s”"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Neizdevās palaist uzlabošanas rīku"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -817,27 +817,27 @@
"Tā visdrīzāk ir kļūda uzlabošanas rīkā. Lūdzu, ziņojiet par to kā par kļūdu, "
"izmantojot komandu “ubuntu-bug ubuntu-release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Uzlabošanas rīka paraksts"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Uzlabošanas rīks"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Neizdevās iegūt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Neizdevās iegūt uzlabojumus. Tā varētu būt tīkla problēma. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Neizdevās autentificēties"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -845,11 +845,11 @@
"Neizdevās autentificēt uzlabojumu. Tā varētu būt gan tīkla, gan servera "
"problēma. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Neizdevās atarhivēt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -857,11 +857,11 @@
"Neizdevās atarhivēt uzlabojumu. Tā varētu būt gan tīkla, gan servera "
"problēma. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Pārbaude neizdevās"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -869,12 +869,12 @@
"Neizdevās pārbaudīt uzlabojumu. Tā varētu būt gan tīkla, gan servera "
"problēma. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Neizdodas palaist uzlabošanu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -882,7 +882,7 @@
"To parasti izraisa sistēma, kurā /tmp tiek montēta ar noexec opciju. Lūdzu, "
"pārmontējiet bez noexec un uzlabojiet sistēmu atkal."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Kļūdas paziņojums ir “%s”."
@@ -993,11 +993,11 @@
"\n"
"Vai jūs vēlaties turpināt?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nav i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1009,11 +1009,11 @@
"minimālā arhitektūra. Ar esošo aparatūru nav iespējams uzlabot Ubuntu uz "
"jaunu laidienu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nav ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1025,11 +1025,11 @@
"minimālo arhitektūru. Diemžēl nav iespējams uzlabot jūsu sistēmu uz jaunāko "
"Ubuntu versiju ar šo aparatūru."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nav pieejams init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1044,11 +1044,11 @@
"\n"
"Vai tiešām vēlaties turpināt?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nav ieslēgts"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1790,11 +1790,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Lejupielādē laidiena uzlabošanas rīku"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Pārbaudīt, vai ir iespējama uzlabošana uz jaunāko izstrādes laidienu"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1873,20 +1873,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Palaidiet “do-release-upgrade”, lai uz to uzlabotu sistēmu."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Programmatūras atjauninātājs"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Pieejams Ubuntu sistēmas uzlabojums uz %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Jūs esat atteicies no sistēmas uzlabošanas uz Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Pievienot atkļūdošanas izvadi"
diff -Nru ubuntu-release-upgrader-17.04.7/po/mhr.po ubuntu-release-upgrader-17.10.1/po/mhr.po
--- ubuntu-release-upgrader-17.04.7/po/mhr.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/mhr.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/mk.po ubuntu-release-upgrader-17.10.1/po/mk.po
--- ubuntu-release-upgrader-17.04.7/po/mk.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/mk.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: mk\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Сервер за %s"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Главен сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Други сервери"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Не можам да го додадам CD-то"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -66,13 +66,13 @@
"Пораката со грешка беше:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Отстрани го пакетот во лоша состојба"
msgstr[1] "Отстрани ги пакетите во лоша состојба"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -87,15 +87,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Оштетени пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -104,7 +104,7 @@
"софтвер. Ве молам поправете ги со Синаптик или apt-get пред да продолжите."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -115,25 +115,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ова најверојатно е минлив проблем, пробајте подоцна."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Не може да се одреди надградбата"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Грешка при автентикација на некои пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -142,38 +142,38 @@
"Не можат да се автентицираат некои пакети. Може да има мрежни пречки. "
"Обидете се повторно. Видете подолу за листа на неавтентицирани пакети."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Не може да се инсталира %s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Не може да се погоди мета пакетот"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -434,7 +434,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Ги проценувам промените"
@@ -454,7 +454,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Не можам да ги симнам надградбите"
@@ -466,33 +466,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Грешка при испраќањето"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Ја враќам првичната состојба на системот"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Не можам да ги инсталирам надградбите"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -503,26 +503,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Да ги отстранам застарените пакети?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Чувај"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Отстрани"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -532,45 +532,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Не се инсталирани потребните зависности"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Потребната зависност „%s“ не е инсталирана. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Проверете го менаџерот за пакети"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Подготвувањето на надградбата не успеа"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Земањето на почетните потребни пакети не успеа"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -578,7 +578,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -587,23 +587,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ги ажурирам информациите за складиштето"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Невалидни информации за пакетот"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -615,40 +615,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Земам"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Надградувам"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Надградбата е завршена"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Барам застарен софтвер"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Надградбата на системот е завршена."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -677,43 +677,43 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Не можам да ја извршам алатката за надградба"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Потпис на алатката за надградба"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Алатка за надградба"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Не можам да симнам"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Симнувањето на надградбите не успеа. Можеби има проблем со мрежата. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Проверката беше неуспешна"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -721,11 +721,11 @@
"Проверката на автентичност на надградбата не успеа. Можеби има проблем со "
"мрежата или серверот. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Не можам да отпакувам"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -733,11 +733,11 @@
"Отпакувањето на надградбата не успеа. Можеби има проблем со мрежата или "
"серверот. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -745,18 +745,18 @@
"Проверката на надградбата не успеа. Можеби има проблем со мережата или со "
"серверот. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -850,11 +850,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -862,11 +862,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -874,11 +874,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -888,11 +888,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1589,11 +1589,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Провери дали е можна надградбата до најновата развојна верзија"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1666,20 +1666,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ml.po ubuntu-release-upgrader-17.10.1/po/ml.po
--- ubuntu-release-upgrader-17.04.7/po/ml.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ml.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ml\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s -ന്റെ സര്വര്"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "പ്രധാന സര്വര്"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "മറ്റെതെങ്ങിലും കേന്ദ്ര കമ്പ്യൂട്ടര്"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list ഇല് കണക്കാക്കാന് കഴിഞ്ഞില്ല"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"വിന്റെ ഡിസ്ക് തന്നെയാണൊ ഉപയോഗിക്കുന്നത് ?! അതോ, മറ്റൊരു processor ആണോ "
"ഉപയോഗിക്കുന്നത്?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "സി ഡി(CD ) ഉള്പ്പെടുത്തുന്നതില് പരാജയപ്പെട്ടു!"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,13 +70,13 @@
"തകരാറിനെ കുറിച്ചുള്ള വിശദീകരണം ഇപ്രകാരമാണ്:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "മോശം നിലയില് ഉള്ള സോഫ്റ്റ്വെയര് നീക്കം ചെയ്യുന്നു"
msgstr[1] "മോശം നിലയില് ഉള്ള സോഫ്റ്റ്വെയറുകള് നീക്കം ചെയ്യുന്നു"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -97,15 +97,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "അപൂര്ണ്ണമായ പാക്കേജുകള്"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -115,7 +115,7 @@
"ഉപയോഗച്ച് അവ ശരിയാക്കിയ ശേഷം തുടരുക."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -126,26 +126,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"ഇരു് മിക്കവാറും താത്കാലികമായ തകരാറ് മാത്രമാണ്, അല്പസമയം കഴിഞ്ഞു ശ്രമിക്കുക."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "നവീകരണം കണക്കുകൂട്ടാന് കഴിഞ്ഞില്ല"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "ചില പാക്കേജുകള് അധികാരപ്പെടുത്തുന്നതില് പിഴവ്"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -155,7 +155,7 @@
"ശ്രിംഖലാ പ്രശ്നമാവാം. താങ്കള്ക്ക് പന്നീട് ശ്രമിക്കാവുന്നതാണ്. "
"അധികാരപ്പെടുത്തുന്നതില് പിഴവ് പറ്റിയ പാക്കേജുകളുടെ പട്ടിക താഴെ കൊടുക്കുന്നു."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -163,36 +163,36 @@
"പാക്കേജ് '%s' ഒഴിവാക്കന്നതിനായി തെരഞ്ഞെടുത്തിരിക്കുന്നു. പക്ഷേ ഈ പാക്കേജ് "
"ഒഴിവാക്കല് പ്രതിരോധിക്കുന്ന പട്ടികയില് ഉള്പെട്ടതാണ്."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
"അവശ്യം ഉണ്ടായിരിക്കേണ്ട പാക്കേജ് '%s' ഒഴിവാക്കുന്നതിനായി "
"തെരെഞ്ഞെടുത്തിരിക്കുന്നു."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"പ്രതിരോധപ്പട്ടികയില് ഉള്ള പതിപ്പ് '%s' ഇന്സ്റ്റാള് ചെയ്യാന് "
"ശ്രമിക്കുന്നു."
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ഇന്സ്റ്റാള് ചെയ്യാന് കഴിയില്ല."
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-package അനുമാനിക്കാന് കഴിയില്ല."
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -454,7 +454,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "മാറ്റങ്ങള് കണക്കാക്കന്നു."
@@ -474,7 +474,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -486,33 +486,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -523,26 +523,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "സൂക്ഷിക്കുക (_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_നീക്കം ചെയ്യുക (Remove)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -550,45 +550,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -596,7 +596,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -605,23 +605,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -633,40 +633,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -695,80 +695,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -862,11 +862,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -874,11 +874,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -886,11 +886,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -900,11 +900,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1579,11 +1579,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1651,20 +1651,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/mn.po ubuntu-release-upgrader-17.10.1/po/mn.po
--- ubuntu-release-upgrader-17.04.7/po/mn.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/mn.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: mn\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s улсын сервер"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Төв сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list бичлэгийг тооцоолж чадсангүй"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Ямар нэг багц файл олдсонгүй. Үбүнтүгийн диск биш эсвэл буруу бүтэцтэй байж "
"магадгүй."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "СD-г нэмэхэд алдаа гарлаа"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,12 +63,12 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Буруу төлөвт байгаа багцыг устгах"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -83,15 +83,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Эвдэрхий боодол"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -100,7 +100,7 @@
"Үргэлжлүүлэхээс өмнө synaptic эсвэл apt-get хэрэглэн тэднийг засна уу"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -111,26 +111,26 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Энэ бол хамгийн боломжтой тогтворгүй асуудал. Дараа дахин оролдоно уу."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Шинэчлэлийг тооцоолж чадахгүй байна"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Баталгаажуулж байгаа зарим боодолд алдаа гарлаа"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -140,38 +140,38 @@
"зуурын алдаа байсан байх. Та магадгүй хүсвэл дараа дахин оролдож болно. Доор "
"баталгаажаагүй боодлуудыг харуулав."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'-ийг суулгаж чадахгүй байна"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-боодлыг таамаглаж чадахгүй байна"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -424,7 +424,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -444,7 +444,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -456,33 +456,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -493,26 +493,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -520,45 +520,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,7 +566,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -575,23 +575,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -603,40 +603,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -665,80 +665,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -832,11 +832,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -844,11 +844,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -856,11 +856,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -870,11 +870,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1549,11 +1549,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1621,20 +1621,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/mr.po ubuntu-release-upgrader-17.10.1/po/mr.po
--- ubuntu-release-upgrader-17.04.7/po/mr.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/mr.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: mr\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s साठी सर्व्हर"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "मुख्य सर्व्हर"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "कस्टम सर्व्हर्स"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list नोंदींची गणना करू शकत नाही"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"पॅकेज फाईल्स मिळाल्या नाहीत, बहुतेक हि उबुंटूची CD नाही किंवा architecture "
"वेगळे आहे."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD घेऊ शकले नाही."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"चुकीबाबतचा संदेश: \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "खराब स्थितीत असलेले पॅकेज काढून टाका"
msgstr[1] "खराब स्थितीत असलेले पॅकेजेस काढून टाका"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "कदाचित सर्व्हर वर अतिरिक्त भार असावा"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "अपुर्ण पॅकेजेस"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"get द्वारे ती अपुर्ण/तुटलेली पॅकेजेस दुरुस्त करा."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -123,26 +123,35 @@
" * Unofficial software packages not provided by Ubuntu\n"
"\n"
msgstr ""
+"सुधारणा गणना करताना न सोडविण्याजोगी समस्या आली.\n"
+"\n"
+" हे यामुळे देखील होऊ शकते:\n"
+" * उबंटूची एक पूर्व प्रकाशन आवृत्ती श्रेणीसुधारित करणे\n"
+" * उबंटूची वर्तमान पूर्व प्रकाशन आवृत्ती चालवणे\n"
+" * उबंटू द्वारे प्रदान न केल्या गेलेले अनधिकृत सॉफ्टवेअर संकुल चालवणे\n"
+"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "ही तात्पुरती समस्या आहे, काही क्षणांनंतर पुन्हा प्रयत्न करा."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
+"जर यातले काहीही लागू होत नसल्यास, नंतर एक टर्मिनल मध्ये आदेश 'ubuntu-bug "
+"ubuntu-release-upgrader-core' वापरून या बगची तक्रार करा."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "अपग्रेडची गणना करू शकले नाही"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "काही पॅकेजेसचे अधिप्रमाणन करताना त्रुटी येत आहेत"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -152,7 +161,7 @@
"समस्येमुळे झाले असावे. काही वेळाने पुन्हा प्रयत्न करून पहा. काही अधिप्रमाणित "
"न केलेल्या पॅकेजेसची यादी पाहण्यासाठी खाली पहा."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -160,32 +169,34 @@
"'%s' हे पॅकेज काढून टाकण्यासाठी चिन्हांकित केले आहे पण ते काढून टाकलेल्या "
"ब्लॅकलिस्ट मध्ये आहे."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "'%s' हे अत्यावश्यक पॅकेज काढून टाकण्यासाठी चिन्हांकित केलेले आहे."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "ब्लॅकलिस्ट केलेली '%s' आवृत्ती स्थापित करण्याचा प्रयत्न करीत आहे"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' हे स्थापित करू शकत नाही"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
+"एक आवश्यक संकुल प्रतिष्ठापीत करणे अशक्य होते. टर्मिनल मध्ये 'ubuntu-bug "
+"ubuntu-release-upgrader-core' टाकून बगची तक्रार करा."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-package ओळखू शकत नाही"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -273,6 +284,10 @@
"with e.g.:\n"
"'%s'"
msgstr ""
+"तुम्ही फायरवॉल वापरत असाल तर तुम्हाला हे पोर्ट तात्पुरते उघडावे लागेल. हे "
+"धोकादायक ठरु शकत असल्याने आपोआप केले जात नाही. पोर्ट उघडण्यासाठी तुम्ही "
+"उदा.\n"
+"'%s'"
#: ../DistUpgrade/DistUpgradeController.py:397
#: ../DistUpgrade/DistUpgradeController.py:442
@@ -305,6 +320,11 @@
"*No* changes written to a system directory from now until the next reboot "
"are permanent."
msgstr ""
+"हा अपग्रेड sandbox (चाचणी) मोडमधे सुरु आहे. सर्व बदल '%s' वर लिहिले जातात "
+"आणि पुढल्या रीबूटनंतर ते नाहिसे होतील.\n"
+"\n"
+"आतापासुन ते पुढल्या रीबूटपर्यंत सिस्टिम डिरेक्टरीवर लिहिले गेलेले *कोणतेही* "
+"बदल कायमस्वरुपाचे नाहीत."
#: ../DistUpgrade/DistUpgradeController.py:443
msgid ""
@@ -316,7 +336,7 @@
#: ../DistUpgrade/DistUpgradeController.py:472
#, python-format
msgid "Can not write to '%s'"
-msgstr ""
+msgstr "'%s' वर लिहु शकत नाही"
#: ../DistUpgrade/DistUpgradeController.py:473
#, python-format
@@ -325,6 +345,9 @@
"upgrade can not continue.\n"
"Please make sure that the system directory is writable."
msgstr ""
+"तुमच्या कॉम्प्युटरवरच्या सिस्टिम डिरेक्टरी '%s' वर लिहिणे शक्य नाहीये. "
+"अपग्रेड पुढे जावू शकत नाही.\n"
+"सिस्टिम डिरेक्टरीवर लिहिणे शक्य आहे याची कृपया खातरजमा करावी."
#: ../DistUpgrade/DistUpgradeController.py:484
msgid "Include latest updates from the Internet?"
@@ -354,7 +377,7 @@
#: ../DistUpgrade/DistUpgradeController.py:659
#, python-format
msgid "Not for humans during development stage of release %s"
-msgstr ""
+msgstr "प्रकाशन %s विकास टप्प्यादरम्यान माणसांसाठी नाही"
#: ../DistUpgrade/DistUpgradeController.py:744
#, python-format
@@ -380,7 +403,7 @@
#. hm, still nothing useful ...
#: ../DistUpgrade/DistUpgradeController.py:822
msgid "Generate default sources?"
-msgstr ""
+msgstr "डिफॉल्ट सोर्सेस बनवायचे?"
#: ../DistUpgrade/DistUpgradeController.py:823
#, python-format
@@ -390,17 +413,23 @@
"Should default entries for '%s' be added? If you select 'No', the upgrade "
"will cancel."
msgstr ""
+"तुमच्या 'sources.list'च्या छाननीत '%s' ची एकही वैध नोंद मिळाली नाही.\n"
+"\n"
+"'%s'च्या डिफॉल्ट नोंदी लिहायच्या का? तुम्ही जर 'No' म्हणालात तर अपग्रेड रद्द "
+"होईल."
#: ../DistUpgrade/DistUpgradeController.py:858
#: ../DistUpgrade/DistUpgradeController.py:864
msgid "Repository information invalid"
-msgstr ""
+msgstr "Repository/भांडारातली माहिती अवैध"
#: ../DistUpgrade/DistUpgradeController.py:859
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
+"Repository/भांडारातली माहिती अपग्रेड करताना फाईल अवैध बनली म्हणुन बग रिपोर्ट "
+"करण्याची क्रिया सुरु होत आहे"
#: ../DistUpgrade/DistUpgradeController.py:865
msgid ""
@@ -410,7 +439,7 @@
#: ../DistUpgrade/DistUpgradeController.py:874
msgid "Third party sources disabled"
-msgstr ""
+msgstr "तृतीय पक्षीय/Third party स्त्रोत निष्क्रिय"
#: ../DistUpgrade/DistUpgradeController.py:875
msgid ""
@@ -418,6 +447,9 @@
"enable them after the upgrade with the 'software-properties' tool or your "
"package manager."
msgstr ""
+"तुमच्या sources.list मधील काही तृतीय पक्षीय/Third party स्त्रोत निष्क्रिय "
+"केलेले आहेत. अपग्रेड झाल्यानंतर् तुम्ही 'software-properties' टूल किंवा "
+"पॅकेज मॅनेजरने ते पुन: सक्रीय करु शकता."
#: ../DistUpgrade/DistUpgradeController.py:916
msgid "Package in inconsistent state"
@@ -447,6 +479,8 @@
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
+"अपडेट करताना अडचण निर्माण झाली. हा सामान्यत: नेटवर्क मधील दोष असतो, तुमचे "
+"नेटवर्क कनेक्शन तपासा आणि परत प्रयत्न करा."
#: ../DistUpgrade/DistUpgradeController.py:986
msgid "Not enough free disk space"
@@ -460,69 +494,80 @@
"your trash and remove temporary packages of former installations using 'sudo "
"apt-get clean'."
msgstr ""
+"अपग्रेडबाहेर पडलेलो आहे.अपग्रेडसाठी '%s' डिस्कवर एकुण '%s' रिकामी जागा "
+"पाहिजे. '%s' वर अजुन कमीतकमी '%s' एवढी जागा रिकामी करा. 'केराची टोपली' "
+"रिकामी करा आणि 'sudo apt-get clean' करुन जुन्या इनस्टॉलेशनच्या वेळचे कामचलाऊ "
+"पॅकेजेस काढुन टाका."
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
-msgstr ""
+msgstr "फ़रकाची मोजदाद करत आहे"
#. ask the user
#: ../DistUpgrade/DistUpgradeController.py:1048
msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "अपग्रेड सुरु करायचा?"
#: ../DistUpgrade/DistUpgradeController.py:1121
msgid "Upgrade canceled"
-msgstr ""
+msgstr "अपग्रेड रद्द झाला"
#: ../DistUpgrade/DistUpgradeController.py:1122
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
msgstr ""
+"आता अपग्रेड रद्द होईल आणि तुमची सिस्टिम होती तशी पुर्ववत होईल. तुम्ही नंतर "
+"परत कधीही अपग्रेड सुरु करु शकता."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
-msgstr ""
+msgstr "अपग्रेड डाउनलोड होउ शकला नाही"
#: ../DistUpgrade/DistUpgradeController.py:1129
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
msgstr ""
+"अपग्रेडच्या बाहेर पडलो आहे. कृपया तुमचे इंटरनेट कनेक्शन अगर इनस्टॉलेशन "
+"माध्यम तपासा आणि परत प्रयत्न करा. आत्तापर्यंत डाउनलोड केलेल्या सर्व फाईल्स "
+"तशाच ठेवलेल्या आहेत."
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
-msgstr ""
+msgstr "कमिट करताना अडचण"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
-msgstr ""
+msgstr "सिस्टिम मुळच्या स्थितीला परत आणत आहे"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
-msgstr ""
+msgstr "अपग्रेड स्थापन करु शकलो नाही"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
+"अपग्रेडच्या बाहेर पडलो आहे. तुमची सिस्टिम निरुपयोगी स्थितीत असु शकते. "
+"पुर्वपदावर येण्याचा प्रयत्न केला जाईल (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -533,80 +578,88 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
+"अपग्रेडच्या बाहेर पडलो आहे. कृपया तुमचे इंटरनेट कनेक्शन अगर इनस्टॉलेशन "
+"माध्यम तपासा आणि परत प्रयत्न करा. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "कालबाह्य पॅकेजेस काढायची?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
-msgstr ""
+msgstr "जपवून ठेवा (_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
-msgstr ""
+msgstr "काढून टाका (_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
-msgstr ""
+msgstr "साफ़-सफ़ाई करताना अडचण आली. अधिक माहितीसाठी कृपया खालील संदेश पाहा. "
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
-msgstr ""
+msgstr "आवश्यक निर्भर पॅकेजेस इनस्टॉल नाहियेत"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
-msgstr ""
+msgstr "आवश्यक निर्भर पॅकेज '%s' इनस्टॉल नाहिये. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
-msgstr ""
+msgstr "पॅकेज मॅनेजर तपासत आहे"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
-msgstr ""
+msgstr "अपग्रेडची तयारी अयशस्वी"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
+"सिस्टिमला अपग्रेडसाठी तयार करण्यात अपयश आले म्हणुन बग रिपोर्टींगची क्रिया "
+"सुरु करत आहे."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
-msgstr ""
+msgstr "अपग्रेडसाठीचे पुर्वावश्यक मिळवणे अयशस्वी"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
"\n"
"Additionally, a bug reporting process is being started."
msgstr ""
+"सिस्टिम अपग्रेडसाठीचे पुर्वावश्यक मिळवण्यात अयशस्वी झाली. अपग्रेड आता बाहेर "
+"पडेल आणि तुमची सिस्टिम मूळ स्थितीला आणुन ठेवेल.\n"
+"\n"
+"याशिवाय एक बग रिपोर्टिंग क्रियादेखील सुरु करण्यात येत आहे."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -615,23 +668,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
-msgstr ""
+msgstr "repository/कोषाची माहिती अपडेट करत आहे"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
-msgstr ""
+msgstr "cdrom समाविष्ट करण्यात अपयश"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
-msgstr ""
+msgstr "क्षमस्व, cdrom चा समावेश करण्यात यश आले नाही."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
-msgstr ""
+msgstr "पॅकेजची माहिती अवैध"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -642,159 +695,171 @@
"In the case of an overloaded mirror, you may want to try the upgrade again "
"later."
msgstr ""
+"तुमचा संकुल माहिती अद्यतनित केल्यानंतर, अत्यावश्यक पॅकेज '%s' स्थित केले जाऊ "
+"शकत नाही. याचे कारण आपल्याकडे सॉफ्टवेअर स्रोतात सूचीबद्ध अधिकृत मिरर नाही "
+"आहे, किंवा कारण आपण वापरत असलेल्या मिररवर जास्त भार आहे. संरचीत सॉफ्टवेअर "
+"स्त्रोतांची सध्याची यादी /etc/apt/sources.list मध्ये पहा.\n"
+"एक ओव्हरलोडेड मिरर बाबतीत, आपण नंतर अद्यतनाचा पुन्हा प्रयत्न करू शकता."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
-msgstr ""
+msgstr "आणतोय"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
-msgstr ""
+msgstr "अपग्रेड करतोय"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
-msgstr ""
+msgstr "अपग्रेड पूर्ण"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
-msgstr ""
+msgstr "अपग्रेड पूर्ण झालाय पण अपग्रेड क्रियेमधे त्रुटी आल्या होत्या."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
-msgstr ""
+msgstr "कालबह्या सॉफ्टवेअरसाठी शोध करत आहे"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
-msgstr ""
+msgstr "सिस्टिम अपग्रेड संपूर्ण"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
-msgstr ""
+msgstr "आंशिक अपग्रेड पूर्ण झालाय"
#: ../DistUpgrade/DistUpgradeFetcher.py:114
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:158
msgid "Could not find the release notes"
-msgstr ""
+msgstr "प्रकाशन टिप शोधू शकत नाही"
#: ../DistUpgrade/DistUpgradeFetcher.py:115
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:159
msgid "The server may be overloaded. "
-msgstr ""
+msgstr "सर्व्हर ओव्हरलोड झाला असेल. "
#: ../DistUpgrade/DistUpgradeFetcher.py:127
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:163
msgid "Could not download the release notes"
-msgstr ""
+msgstr "प्रकाशन टिप डाउनलोड करू शकला नाही"
#: ../DistUpgrade/DistUpgradeFetcher.py:128
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:164
msgid "Please check your internet connection."
-msgstr ""
+msgstr "कृपया तुमचे इंटरनेट कनेक्टशन तपासा."
#: ../DistUpgrade/DistUpgradeFetcherCore.py:73
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
-msgstr ""
+msgstr "'%(file)s' चे प्रमाणीकृत विरुद्ध '%(signature)s' करा "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
-msgstr ""
+msgstr "'%s' बाहेर काढत आहे"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "अद्यतन साधन चालू शकले नाही"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
+"बहुधा सुधारणा साधन मध्ये बग आहे. आज्ञा 'ubuntu-bug ubuntu-release-upgrader-"
+"core' वापरून बग म्हणून तक्रार करा."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
-msgstr ""
+msgstr "अद्यतन साधन सही"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
-msgstr ""
+msgstr "अद्यतन साधन"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
-msgstr ""
+msgstr "मिळविता आले नाही"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "अद्ययावत करता आले नाही. कदाचीत network मध्ये त्रूटी असेल. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
-msgstr ""
+msgstr "ओळख अपयशी"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
+"सुधारणा प्रमाणीकरण अयशस्वी. नेटवर्क किंवा सर्व्हरसह एक समस्या असू शकते. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
-msgstr ""
+msgstr "बाहेर काढण्यास अयशस्वी"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
-msgstr ""
+msgstr "सुधारणा अवतरण अयशस्वी. नेटवर्क किंवा सर्व्हरसह एक समस्या असू शकते. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
-msgstr ""
+msgstr "पडताळणी अयशस्वी झाली आहे"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
+"अद्ययावत करण्याची पडताळणी अयशस्वी झाली आहे.कदाचीत नेटवर्क किंवा सर्वर मध्ये "
+"त्रूटी आहे. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "अपग्रेड सुरु करू शकत नाही."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
+"हे सामान्यतः सिस्टीम मूळे होते जिथे /tmp noexec म्हणून mount केले "
+"जाते.कृपया nonexec सोडून पुन्हा mount करा आणि अद्ययावत करणे पुन्हा सुरु करा."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
-msgstr ""
+msgstr "'%s' त्रुटी संदेश आहे"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:139
msgid "&Upgrade"
-msgstr ""
+msgstr "अद्यतन करा (_U)"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:142
msgid "&Cancel"
-msgstr ""
+msgstr "रद्द करा (&C)"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:144
#: ../data/gtkbuilder/ReleaseNotes.ui.h:1
msgid "Release Notes"
-msgstr ""
+msgstr "रिलीज़ नोट्स"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:201
msgid "Upgrade"
@@ -803,17 +868,17 @@
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:217
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:232
msgid "Downloading additional package files..."
-msgstr ""
+msgstr "लागणारे अधिक पाकेजस डाऊनलोड करत आहे ..."
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:234
#, python-format
msgid "File %s of %s at %sB/s"
-msgstr ""
+msgstr "%2s पैकी %1s फाईल %3s B/s या गतीने"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:238
#, python-format
msgid "File %s of %s"
-msgstr ""
+msgstr "%2s पैकी %1s फाईल"
#. print("mediaChange %s %s" % (medium, drive))
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:245
@@ -821,18 +886,18 @@
#: ../DistUpgrade/DistUpgradeViewKDE.py:219
#, python-format
msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "कृपया '%s' ड्राइव्ह '%s' मध्ये समाविष्ट करा"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:247
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:252
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:253
#: ../DistUpgrade/DistUpgradeViewKDE.py:220
msgid "Media Change"
-msgstr ""
+msgstr "मीडिया बदल"
#: ../DistUpgrade/DistUpgradeQuirks.py:183
msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
-msgstr ""
+msgstr "आपल्या ग्राफिक्स हार्डवेअर उबंटू 14.04 मध्ये पूर्णपणे समर्थीत नाही."
#: ../DistUpgrade/DistUpgradeQuirks.py:185
msgid ""
@@ -848,6 +913,7 @@
msgid ""
"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
+"तुमचे ग्राफिक हार्डवेयर कदाचित उबुंटू १२.०४ LTS पूर्णपणे वापरू शकत नाही"
#: ../DistUpgrade/DistUpgradeQuirks.py:211
msgid ""
@@ -871,12 +937,15 @@
"\n"
"Do you want to continue?"
msgstr ""
+"हा संगणक सध्या AMD 'fglrx' ग्राफिक driver वापरत आहे.उबुंटू १०.०४ LTS मध्ये "
+"तुमचे हार्डवेयर वापरण्या साठी ह्या driver ची कोणतीही आवृत्ती उपलभ्ध नाही.\n"
+"तुम्हाला पुढे जायचे?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
-msgstr ""
+msgstr "हा i686 CPU नाही"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -884,23 +953,26 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
-msgstr ""
+msgstr "हा ARMv6 CPU नाही"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
msgstr ""
+"तुमच्या संगणकाचा ARM CPU हा ARMv6 ह्या आवृत्ती पेक्षा जुना आहे.सगळ्या "
+"प्रणाली karmic मध्ये कमीतकमी ARMv6 ला गृहीत धरून बनवल्या आहेत.ह्या हार्डवेयर "
+"वर तुम्हाला उबुंटू अद्ययावत करता येणार नाही."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
-msgstr ""
+msgstr "init उपलब्ध नाही"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -910,11 +982,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
-msgstr ""
+msgstr "PAE अक्षम आहे"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -924,21 +996,23 @@
#: ../DistUpgrade/DistUpgradeMain.py:59
msgid "Sandbox upgrade using aufs"
-msgstr ""
+msgstr "aufs वापरून सॅन्डबॉक्स अद्यतन"
#: ../DistUpgrade/DistUpgradeMain.py:61
msgid "Use the given path to search for a cdrom with upgradable packages"
-msgstr ""
+msgstr "अद्यतन संकुले शोधण्यासाठी देण्यात आलेला सीडी-रॉम मार्ग वापरावा"
#: ../DistUpgrade/DistUpgradeMain.py:67
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
msgstr ""
+"फ्रन्टएन्ड वापरा. सध्या उपलब्ध: \n"
+"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
#: ../DistUpgrade/DistUpgradeMain.py:70
msgid "*DEPRECATED* this option will be ignored"
-msgstr ""
+msgstr "*नाकारले* हा पर्याय दुर्लक्षित केला जाईल"
#: ../DistUpgrade/DistUpgradeMain.py:73
msgid "Perform a partial upgrade only (no sources.list rewriting)"
@@ -946,15 +1020,15 @@
#: ../DistUpgrade/DistUpgradeMain.py:76
msgid "Disable GNU screen support"
-msgstr ""
+msgstr "GNU स्क्रीन समर्थन अक्षम करा"
#: ../DistUpgrade/DistUpgradeMain.py:78
msgid "Set datadir"
-msgstr ""
+msgstr "datadir सेट करा"
#: ../DistUpgrade/DistUpgradeMain.py:81
msgid "Upgrade to the development release"
-msgstr ""
+msgstr "विकास प्रकाशनवर श्रेणीसुधारित करा"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:145
#: ../DistUpgrade/DistUpgradeViewKDE.py:233
@@ -987,19 +1061,19 @@
#: ../DistUpgrade/DistUpgradeViewGtk3.py:197
#: ../DistUpgrade/DistUpgradeViewKDE.py:290
msgid "Applying changes"
-msgstr ""
+msgstr "बदल करत आहे"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk3.py:223
#: ../DistUpgrade/DistUpgradeViewKDE.py:303
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "अवलंबून असलेल्या समस्यांमुळे - ज़ुळवणी न करिता सोडून देते"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:228
#: ../DistUpgrade/DistUpgradeViewKDE.py:305
#, python-format
msgid "Could not install '%s'"
-msgstr ""
+msgstr "'%s' स्थापित होऊ शकले नाही"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:229
#: ../DistUpgrade/DistUpgradeViewKDE.py:306
@@ -1028,12 +1102,12 @@
#: ../DistUpgrade/DistUpgradeViewGtk3.py:267
#: ../DistUpgrade/DistUpgradeViewKDE.py:352
msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "'diff ' आज्ञा सापडली नाही"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:524
#: ../DistUpgrade/DistUpgradeViewText.py:138
msgid "A fatal error occurred"
-msgstr ""
+msgstr "काहीतरी जबर घोळ झाला"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:525
msgid ""
@@ -1045,7 +1119,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk3.py:555
msgid "Ctrl-c pressed"
-msgstr ""
+msgstr "Ctrl-c दाबले"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:556
msgid ""
@@ -1081,12 +1155,12 @@
#: ../DistUpgrade/DistUpgradeViewGtk3.py:712
#, python-format
msgid "Install (%s)"
-msgstr ""
+msgstr "(%s) स्थापा"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:713
#, python-format
msgid "Upgrade (%s)"
-msgstr ""
+msgstr "(%s) अद्ययावत"
#: ../DistUpgrade/DistUpgradeViewKDE.py:364
msgid "Show Difference >>>"
@@ -1098,19 +1172,19 @@
#: ../DistUpgrade/DistUpgradeViewKDE.py:567
msgid "Error"
-msgstr ""
+msgstr "त्रुटी"
#: ../DistUpgrade/DistUpgradeViewKDE.py:819
msgid "&Close"
-msgstr ""
+msgstr "बंद करा (&C)"
#: ../DistUpgrade/DistUpgradeViewKDE.py:619
msgid "Show Terminal >>>"
-msgstr ""
+msgstr "टर्मिनल दाखवा >>>"
#: ../DistUpgrade/DistUpgradeViewKDE.py:622
msgid "<<< Hide Terminal"
-msgstr ""
+msgstr "<<< टर्मिनल लपवा"
#: ../DistUpgrade/DistUpgradeViewKDE.py:701
msgid "Information"
@@ -1125,7 +1199,7 @@
#: ../DistUpgrade/DistUpgradeViewKDE.py:805
#: ../data/gtkbuilder/DistUpgrade.ui.h:7
msgid "Details"
-msgstr ""
+msgstr "तपशील"
#: ../DistUpgrade/DistUpgradeViewKDE.py:781
#, python-format
@@ -1135,28 +1209,28 @@
#: ../DistUpgrade/DistUpgradeViewKDE.py:783
#, python-format
msgid "Remove %s"
-msgstr ""
+msgstr "%s काढून टाका"
#: ../DistUpgrade/DistUpgradeViewKDE.py:785
#: ../DistUpgrade/DistUpgradeViewText.py:236
#, python-format
msgid "Remove (was auto installed) %s"
-msgstr ""
+msgstr "काढा(आपोआप प्रस्थापित केले होते) %s"
#: ../DistUpgrade/DistUpgradeViewKDE.py:787
#, python-format
msgid "Install %s"
-msgstr ""
+msgstr "इन्स्टॉल %s"
#: ../DistUpgrade/DistUpgradeViewKDE.py:789
#, python-format
msgid "Upgrade %s"
-msgstr ""
+msgstr "अद्ययावत %s"
#: ../DistUpgrade/DistUpgradeViewKDE.py:815
#: ../DistUpgrade/DistUpgradeViewText.py:284
msgid "Restart required"
-msgstr ""
+msgstr "आवश्यक असलेले पुन्हा सुरु करा"
#: ../DistUpgrade/DistUpgradeViewKDE.py:815
msgid "Restart the system to complete the upgrade"
@@ -1165,7 +1239,7 @@
#: ../DistUpgrade/DistUpgradeViewKDE.py:818
#: ../data/gtkbuilder/DistUpgrade.ui.h:14
msgid "_Restart Now"
-msgstr ""
+msgstr "प्रणाली बंद करून परत सुरु करा."
#. FIXME make this user friendly
#: ../DistUpgrade/DistUpgradeViewKDE.py:836
@@ -1175,6 +1249,9 @@
"The system could be in an unusable state if you cancel the upgrade. You are "
"strongly advised to resume the upgrade."
msgstr ""
+"सुरु असलेले अद्ययावत रद्द करा?\n"
+"अद्ययावत करणे रद्द केल्यास सिस्टीम अस्थिर होऊ शकते.अद्ययावत करणे सुरु ठेवा "
+"हा तुम्हाला ठाम सल्ला आहे ."
#: ../DistUpgrade/DistUpgradeViewKDE.py:840
msgid "Cancel Upgrade?"
@@ -1255,7 +1332,7 @@
#. xgettext picks them up.
#: ../DistUpgrade/DistUpgradeView.py:280 ../data/gtkbuilder/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
-msgstr ""
+msgstr "अद्ययावत करण्यासाठी तयार होत आहे"
#: ../DistUpgrade/DistUpgradeView.py:281
msgid "Getting new software channels"
@@ -1263,7 +1340,7 @@
#: ../DistUpgrade/DistUpgradeView.py:282 ../data/gtkbuilder/DistUpgrade.ui.h:23
msgid "Getting new packages"
-msgstr ""
+msgstr "नवीन पाकेजस मिळवत आहे"
#: ../DistUpgrade/DistUpgradeView.py:283 ../data/gtkbuilder/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
@@ -1271,7 +1348,7 @@
#: ../DistUpgrade/DistUpgradeView.py:284 ../data/gtkbuilder/DistUpgrade.ui.h:25
msgid "Cleaning up"
-msgstr ""
+msgstr "साफ करत आहे"
#: ../DistUpgrade/DistUpgradeView.py:372
#, python-format
@@ -1290,22 +1367,22 @@
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d पाकेज काढून टाकले जाणार आहे"
+msgstr[1] "%d पाकेजस काढून टाकले जाणार आहे"
#: ../DistUpgrade/DistUpgradeView.py:386
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d नवीन पाकेज प्रस्थापित केले जाणार आहे."
+msgstr[1] "%d नवीन पाकेजस प्रस्थापित केले जाणार आहे."
#: ../DistUpgrade/DistUpgradeView.py:392
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d पाकेज अद्ययावत केले जाणार आहे."
+msgstr[1] "%d पाकेजस अद्ययावत केले जाणार आहे."
#: ../DistUpgrade/DistUpgradeView.py:400
#, python-format
@@ -1314,12 +1391,17 @@
"\n"
"You have to download a total of %s. "
msgstr ""
+"\n"
+"\n"
+"तुम्हाला एकून %s डाऊनलोड करावे लागेल. "
#: ../DistUpgrade/DistUpgradeView.py:405
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
+"अद्ययावत करण्यास कित्येक तास लागू शकतात.एकदा डाऊनलोड झाल्यावर क्रिया "
+"थांबविता येणार नाही."
#: ../DistUpgrade/DistUpgradeView.py:409
msgid ""
@@ -1329,7 +1411,7 @@
#: ../DistUpgrade/DistUpgradeView.py:414
msgid "Removing the packages can take several hours. "
-msgstr ""
+msgstr "पाकेजस काढून टाकण्यास कित्येक तास लागू शकतात. "
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeView.py:419
@@ -1344,12 +1426,14 @@
#: ../DistUpgrade/DistUpgradeView.py:433
msgid "Reboot required"
-msgstr ""
+msgstr "पुन्हा सुरु करणे आवश्यक आहे"
#: ../DistUpgrade/DistUpgradeView.py:434
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
+"अद्ययावत करणे संपले आहे,पुन्हा सुरु करणे आवश्यक आहे.तुम्हाला हे आता करायचे "
+"आहे ?"
#: ../DistUpgrade/DistUpgradeViewText.py:81
#, python-format
@@ -1366,7 +1450,7 @@
#: ../DistUpgrade/DistUpgradeViewText.py:163
msgid "Aborting"
-msgstr ""
+msgstr "अयशस्वी झाल्यामुळे बंद करीत आहे"
#: ../DistUpgrade/DistUpgradeViewText.py:168
msgid "Demoted:\n"
@@ -1374,18 +1458,18 @@
#: ../DistUpgrade/DistUpgradeViewText.py:175
msgid "To continue please press [ENTER]"
-msgstr ""
+msgstr "सुरु ठेवण्यासाठी कृपया [ENTER] दाबा"
#: ../DistUpgrade/DistUpgradeViewText.py:212
#: ../DistUpgrade/DistUpgradeViewText.py:250
#: ../DistUpgrade/DistUpgradeViewText.py:257
msgid "Continue [yN] "
-msgstr ""
+msgstr "सुरु ठेवा(हो/नाही) "
#: ../DistUpgrade/DistUpgradeViewText.py:212
#: ../DistUpgrade/DistUpgradeViewText.py:250
msgid "Details [d]"
-msgstr ""
+msgstr "तपशील[d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
@@ -1404,7 +1488,7 @@
#. TRANSLATORS: the "d" is "details"
#: ../DistUpgrade/DistUpgradeViewText.py:222
msgid "d"
-msgstr ""
+msgstr "d"
#: ../DistUpgrade/DistUpgradeViewText.py:227
#, python-format
@@ -1419,7 +1503,7 @@
#: ../DistUpgrade/DistUpgradeViewText.py:242
#, python-format
msgid "Install: %s\n"
-msgstr ""
+msgstr "%s प्रस्थापित करा.\n"
#: ../DistUpgrade/DistUpgradeViewText.py:247
#, python-format
@@ -1435,16 +1519,18 @@
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
msgstr ""
+"अद्ययावत करणे पूर्ण करण्यासाठी पुन्हा सुरु करणे आवश्यक आहे. तुम्ही ' हो ' "
+"निवडल्यास सिस्टीम पुन्हा सुरु होईल."
#: ../DistUpgrade/GtkProgress.py:71
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
+msgstr "फाईल डाऊनलोड %(total)li पैकी %(current)li आणि %(speed)s/s"
#: ../DistUpgrade/GtkProgress.py:77
#, python-format
msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "फाईल डाऊनलोड %(total)li पैकी %(current)li"
#: ../data/gtkbuilder/AcquireProgress.ui.h:1
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
@@ -1453,11 +1539,11 @@
#: ../data/gtkbuilder/DistUpgrade.ui.h:1
msgid "_Cancel Upgrade"
-msgstr ""
+msgstr "_अद्ययावत करणे रद्द करा"
#: ../data/gtkbuilder/DistUpgrade.ui.h:2
msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_अद्ययावत करणे चालू ठेवा"
#: ../data/gtkbuilder/DistUpgrade.ui.h:3
msgid ""
@@ -1465,7 +1551,7 @@
"\n"
"The system could be in an unusable state if you cancel the upgrade. You are "
"strongly adviced to resume the upgrade."
-msgstr ""
+msgstr "सुरु असलेले अद्ययावत करणे रद्द करायचे का? "
#: ../data/gtkbuilder/DistUpgrade.ui.h:6
msgid "_Start Upgrade"
@@ -1473,7 +1559,7 @@
#: ../data/gtkbuilder/DistUpgrade.ui.h:9
msgid "_Replace"
-msgstr ""
+msgstr "अदलाबदल करा (_R)"
#: ../data/gtkbuilder/DistUpgrade.ui.h:10
msgid "Difference between the files"
@@ -1481,7 +1567,7 @@
#: ../data/gtkbuilder/DistUpgrade.ui.h:11
msgid "_Report Bug"
-msgstr ""
+msgstr "त्रूटी कळवा (_R)"
#: ../data/gtkbuilder/DistUpgrade.ui.h:12
msgid "_Continue"
@@ -1519,11 +1605,11 @@
#: ../data/gtkbuilder/DistUpgrade.ui.h:24
msgid "Restarting the computer"
-msgstr ""
+msgstr "संगणक पुन्हा सुरु करत आहे"
#: ../data/gtkbuilder/DistUpgrade.ui.h:27
msgid "Terminal"
-msgstr ""
+msgstr "टर्मिनल"
#: ../data/gtkbuilder/ReleaseNotes.ui.h:2
msgid "_Upgrade"
@@ -1592,11 +1678,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1617,6 +1703,8 @@
"Check only if a new distribution release is available and report the result "
"via the exit code"
msgstr ""
+"वितरणाची नवी रिलिज उपलब्ध आहे का एव्हढेच फक्त तपास आणि exit code द्वारे "
+"उत्तर कळव"
#: ../do-release-upgrade:117
msgid "The options --devel-release and --proposed are"
@@ -1628,7 +1716,7 @@
#: ../do-release-upgrade:122
msgid "Checking for a new Ubuntu release"
-msgstr ""
+msgstr "उबुंटूची नवीन आवृत्ती उपलब्ध आहे का ह्याचा शोध चालू आहे"
#: ../do-release-upgrade:134
msgid "Your Ubuntu release is not supported anymore."
@@ -1664,20 +1752,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "त्याला अपग्रेड करण्यासाठी 'do-release-upgrade' चालवा."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "उबुंटू %s(वर्जन) अपग्रेड उपलब्ध"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "तुम्ही उबुंटूला अपग्रेड करण्यास नकार करत आहात. %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ms.po ubuntu-release-upgrader-17.10.1/po/ms.po
--- ubuntu-release-upgrader-17.04.7/po/ms.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ms.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,14 +15,14 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"X-Poedit-Country: MALAYSIA\n"
"Language: ms\n"
"X-Poedit-Language: Malay\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Pelayan untuk %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Pelayan Utama"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Pelayan Suai"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Tidak dapat mengira masukan sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"Tidak boleh mengenalpasti sebarang fail pakej, mungkin ini bukan Cakera "
"Ubuntu atau arkitektur yang sesuai?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Gagal menyenaraikan CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Mesej ralat adalah:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Buang pakej yang rosak"
msgstr[1] "Buang pakej-pakej yang rosak"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Kemungkinan pelayan melebihi had"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pakej rosak"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"sebelum meneruskan tindakan yang lain."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -132,12 +132,12 @@
" * Pakej perisian tidak rasmi tidak disediakan oleh Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Kemungkinan ini adalah masalah sementara sahaja. Sila cuba lagi kemudian."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -145,15 +145,15 @@
"Jika tiada dilaksanakan, sila laporkan pepijat ini menggunakan perintah "
"'ubuntu-bug ubuntu-release-upgrader-core' didalam terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Tidak dapat mengira penataran"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Ralat mengesahkan sesetengah pakej"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -163,7 +163,7 @@
"masalah sementara rangkaian. Anda mungkin mahu mencuba lagi kemudian. Lihat "
"dibawah untuk pakej-pakej yang belum disahkan."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -171,22 +171,22 @@
"Pakej '%s' telah ditanda untuk pembuangan tetapi ia ada di dalam senarai "
"hitam pembuangan."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Pakej yang diperlukan '%s' telah ditanda untuk dibuang"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Cubaan untul memasang versi '%s' yang disenarai hitam"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Tidak dapat memasang '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -195,11 +195,11 @@
"menggunakan perintah 'ubuntu-bug ubuntu-release-upgrader-core' didalam "
"terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Pakej meta tidak dapat diduga."
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -522,7 +522,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Mengira perubahan"
@@ -544,7 +544,7 @@
"Anda boleh sambung semula penataran dilain masa."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai."
@@ -559,27 +559,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Ralat semasa perlaksanaan"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Mengembalikan sistem ke keadaan asal."
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Pakej-pakej gagal dinaiktaraf."
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -587,7 +587,7 @@
"Penataran telah diabaikan. Sistem anda mungkin dalam keadaan tidak stabil. "
"Pemulihan akan dijalankan )dkpg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -605,7 +605,7 @@
"pepijat.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -613,20 +613,20 @@
"Penataran telah diabaikan. Sila semak sambungan Internet atau media "
"pemasangan anda dan cuba lagi. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Buang pakej luput?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Kekalkan"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Buang"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -636,28 +636,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Keperluan yang diperlukan tidak dipasang"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Dependensi %s yang diperlukan tidak dipasang. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Memeriksa pengurus pakej"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Persediaan penataran telah gagal"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -665,7 +665,7 @@
"Penyediaan sistem untuk tatar gagal maka proses pelaporan pepijat sedang "
"dimulakan."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -673,12 +673,12 @@
"Penyediaan sistem untuk tatar gagal. Untuk melaporkan pepijat pasang apport "
"kemudian lakukan 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Mendapatkan prasyarat penataran gagal"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -690,7 +690,7 @@
"\n"
"Disamping itu, satu proses pelaporan pepijat dimulakan."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -704,23 +704,23 @@
"Untuk melaporkan pepijat pasang apport kemudian lakukan 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Mengemaskini maklumat repositori"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Gagal menambah ke cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Maaf, penambahan ke cdrom tidak berjaya."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Maklumat pakej tidah sah"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -738,40 +738,40 @@
"terkonfigur.\n"
"Dalam kes cermin terlebih muatan, anda boleh tatar kemudian."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Mengambil"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Menatarkan"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Penataran Selesai"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Penataran selesai tetapi terdapat ralat semasa proses penataran."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Menggelintar perisian luput"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Penataran sistem telah selesai."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Penataran separa telah selesai."
@@ -800,17 +800,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "sahihkan '%(file)s' terhadap '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "mengekstrak '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Tidak dapat menjalankan alat penataran"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -818,28 +818,28 @@
"Ia berkemungkinan pepijat dalam alat tatar. sila laporkan pepijat ini "
"menggunakan perintah 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Tandatangan alat penataran"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Alat penataran"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Gagal mengambil"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Proses memperoleh penataran gagal. Mungkin terdapat masalah rangkaian. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Penyahihan gagal"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -847,11 +847,11 @@
"Pengesahan menatar gagal. Mungkin terdapat masalah dengan rangkaian atau "
"dengan pelayan. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Gagal mengekstrak"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -859,11 +859,11 @@
"Proses mengekstrak penataran gagal. Mungkin terdapat masalah dengan "
"rangkaian atau dengan pelayan. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Pengesahan gagal"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -871,12 +871,12 @@
"Pengesahan menatar gagal. Mungkin terdapat masalah dengan rangkaian atau "
"dengan pelayan. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Tidak dapat menjalankan penataran"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -884,7 +884,7 @@
"Ini biasanya disebabkan oleh sistem yang mana /tmp melekapkan noexec. Sila "
"nyahlekap noexec dan jalankan tatar lagi."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Mesej ralat ialah '%s'."
@@ -995,11 +995,11 @@
"\n"
"Adakah anda ingin meneruskannya?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "CPU No i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1011,11 +1011,11 @@
"senibina minimum. Adalah tidak mungkin menatar sistem anda kepada pelepasan "
"Ubuntu baru dengan perkakasan ini."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Tiada CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1027,11 +1027,11 @@
"sebagai senibina yang minimum. Adalah tidak mungkin sistem anda boleh "
"ditatarkan kepada pelepasan Ubuntu yang terbaru menggunakan perkakasan ini."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Tiada init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1046,11 +1046,11 @@
"\n"
"Adakah anda ingin meneruskannya?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE tidak dibenarkan"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1785,11 +1785,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Memuat turun alat pelepasan tatar"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Semak jika menatar ke pelepasan devel terkini jika boleh"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1867,20 +1867,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Jalankan 'do-release-upgrade' untuk menatarkannya."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Pengemaskini Perisian"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Penataran Ubuntu %(version)s Sudah Ada"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Anda telah menolak penataran Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Tambah output nyahpepijat"
diff -Nru ubuntu-release-upgrader-17.04.7/po/mus.po ubuntu-release-upgrader-17.10.1/po/mus.po
--- ubuntu-release-upgrader-17.04.7/po/mus.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/mus.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/my.po ubuntu-release-upgrader-17.10.1/po/my.po
--- ubuntu-release-upgrader-17.04.7/po/my.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/my.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: my\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "အဓိကဆာဗာ"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list စာရင်းကိုဖတ်၍မရပါ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Package file တခုမှမတွေ့ပါ။ Ubuntu အခွေမဟုတ်၍သော်လည်းကောင်း (သို့) "
"တခြားအခွေဖြစ်နေ၍သော်လည်းကောင်း ဖြစ်နိုင်သည်။"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD ကိုထည့်၍မရနိုင်ပါ။"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -84,15 +84,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "ဆာဗာအလုပ်များနေသည်"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "အပြည့်အစုံမပါသော Pakage များ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -101,7 +101,7 @@
"software. Please fix them first using synaptic or apt-get before proceeding."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -112,25 +112,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Upgrade ကိုမတွက်ချက်နိုင်ပါ။"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -140,38 +140,38 @@
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ကိုမသွင်းနိုင်ပါ။"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Can't guess meta-package"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -422,7 +422,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -442,7 +442,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -454,33 +454,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -491,26 +491,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -518,45 +518,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -564,7 +564,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -573,23 +573,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -601,40 +601,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -663,80 +663,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -830,11 +830,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -842,11 +842,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -854,11 +854,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -868,11 +868,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1547,11 +1547,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1619,20 +1619,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/nb.po ubuntu-release-upgrader-17.10.1/po/nb.po
--- ubuntu-release-upgrader-17.04.7/po/nb.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/nb.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: nb\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Tjener for %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hovedtjener"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Egendefinerte tjenere"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Klarte ikke å beregne oppføringa i sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Fant ingen pakkefiler. Kanskje dette ikke er en Ubuntu-disk, eller korrekt "
"arkitektur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Klarte ikke å legge til CD-plata"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Feilmeldinga var som følger:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Fjerne pakke som er i ustand"
msgstr[1] "Fjern pakker som er i ustand"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -94,15 +94,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Tjeneren kan være opptatt"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Ødelagte pakker"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"eller kommandoen «apt-get» før du fortsetter."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,11 +130,11 @@
" * er avhengig av uoffisielle programpakker som ikke støttes av Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Dette er sannsynligvis et midlertidig problem. Prøv igjen senere."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -142,15 +142,15 @@
"Hvis det overnevnte er irrelevant, ber vi om at du rapporterer feilen ved å "
"skrive kommandoen «ubuntu-bug ubuntu-release-upgrader-core» i en terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Klarte ikke å forberede oppgraderinga"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Feil ved autentisering av enkelte pakker"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -160,29 +160,29 @@
"nettverksproblem. Du bør prøve igjen senere. Se liste over berørte pakker "
"nedenfor."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Pakka «%s» er merket for fjerning, men er også svartelistet mot fjerning."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Den essensielle pakka «%s» er merket for fjerning."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Prøver å installere svartelistet versjon «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Klarte ikke å installere «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -191,11 +191,11 @@
"Vennligst rapporter dette som en feil ved å skrive «ubuntu-bug ubuntu-"
"release-upgrader-core» i et terminalvindu."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Klarer ikke å gjette meta-pakke"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -524,7 +524,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Beregner endringene"
@@ -546,7 +546,7 @@
"Du kan vende tilbake til oppgraderinga når som helst."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Klarte ikke å laste ned oppgraderingene"
@@ -561,27 +561,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Feil under innsending"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Gjenoppretter systemets opprinnelige tilstand"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Klarte ikke å installere oppgraderingene"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -589,7 +589,7 @@
"Oppgraderinga ble avbrutt. Systemet ditt kan være ubukelig inntil videre. "
"Gjenoppretting startes nå (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -606,7 +606,7 @@
"Filene i «/var/log/dist-upgrade/» bør legges ved feilrapporten.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -614,20 +614,20 @@
"Oppgraderinga ble avbrutt. Kontroller internettilkoblingen eller "
"installasjonsmediet, og prøv igjen. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Vil du fjerne utdaterte pakker?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Behold"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Fjern"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -637,28 +637,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Nødvendige avhengigheter er ikke installert"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Den nødvendige avhengigheten «%s» er ikke installert. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Sjekker pakkehåndterer"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Klarte ikke å forberede oppgraderinga"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -666,7 +666,7 @@
"Noe gikk galt under forberedelser til systemoppgradering. Starter "
"feilrapportering."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -675,12 +675,12 @@
"som en programfeil, må du installere «apport» og deretter kjøre «apport-bug "
"ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Nedlasting av programavhengigheter mislyktes"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -692,7 +692,7 @@
"\n"
"I tillegg blir programfeilen innrapportert."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -706,23 +706,23 @@
"For å rapportere dette som en programfeil, må du installere «apport» og "
"deretter kjøre «apport-bug ubuntu-release-upgrader»."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Oppdaterer informasjon om pakkekilder"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Klarte ikke å legge til CD-stasjonen"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Klarte ikke å legge til CD-stasjonen."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ugyldig pakkeinformasjon"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -741,40 +741,40 @@
"Hvis det er sannsynlig at speiltjeneren er overbelastet, bør du forsøke å "
"kjøre oppgraderinga på nytt senere."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Henter"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Oppgraderer"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Oppgraderinga er fullført"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Oppgraderinga er ferdig, men det oppstod feil underveis."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Søker etter utdatert programvare"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Systemet er oppgradert."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Delvis oppgradering er fullført."
@@ -803,17 +803,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autentisere «%(file)s» mot «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "pakker ut «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Klarte ikke å kjøre oppgraderingsverktøyet"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -821,28 +821,28 @@
"Dette er sannsynligvis en programfeil i oppgraderingsverktøyet. Rapporter "
"feilen ved å kjøre kommandoen «ubuntu-bug ubuntu-release-upgrader-core»."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signatur for oppgraderingsverktøyet"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Oppgraderingsverktøy"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Klarte ikke å hente"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Klarte ikke å hente oppgraderinga. Dette kan skyldes nettverksproblemer. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autentisering mislyktes"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -850,11 +850,11 @@
"Klarte ikke å autentisere oppgraderinga. Dette kan skyldes et problem med "
"nettverket eller tjeneren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Utpakking mislyktes"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -862,11 +862,11 @@
"Klarte ikke å pakke ut oppgraderinga. Det kan skyldes et problem med "
"nettverket eller tjeneren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Kontroll mislyktes"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -874,12 +874,12 @@
"Klarte ikke å bekrefte oppgraderinga. Dette kan skyldes en feil med "
"nettverket eller tjeneren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Klarte ikke å sette i gang oppgraderinga"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -887,7 +887,7 @@
"Dette skyldes vanligvis at /tmp er montert med valget «noexec». Monter /tmp "
"på nytt uten «noexec», og start deretter oppgraderinga på nytt."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Feilmeldingen er «%s»."
@@ -999,11 +999,11 @@
"\n"
"Vil du fortsette?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ikke en i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1015,11 +1015,11 @@
"er ikke mulig å oppgradere dette systemet til en ny versjon av Ubuntu med "
"denne maskinvaren."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ingen ARMv6-prosessor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1031,11 +1031,11 @@
"Det er ikke mulig å oppgradere systemet ditt til en ny Ubuntu-versjon med "
"denne maskinvaren."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Ingen oppstartsprogrammer (init) tilgjengelig"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1051,11 +1051,11 @@
"\n"
"Vil du fortsette likevel?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE er ikke aktivert"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1792,11 +1792,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Laster ned oppgraderingsverktøy"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Sjekk om systemet kan oppgraderes til nyeste utviklingsversjon"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1876,20 +1876,22 @@
msgstr ""
"Kjør «do-release-upgrade» for å oppgradere systemet til denne versjonen."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Oppdateringsverktøy"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu kan nå oppgraderes til versjon %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Du har avslått å oppgradere til Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Ta med utskrift av feilsøkingsinfo"
diff -Nru ubuntu-release-upgrader-17.04.7/po/nds.po ubuntu-release-upgrader-17.10.1/po/nds.po
--- ubuntu-release-upgrader-17.04.7/po/nds.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/nds.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server für %s"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hauptserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Eegene Server"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Künn de Indrag sources.list nich bereknen"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Das Hinzufügen der CD ist fehlgeschlagen"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,13 +67,13 @@
"Die Fehlermeldung lautete:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Defekte Pakete löschen"
msgstr[1] "Defekte Pakete löschen"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -88,22 +88,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Defekte Pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -114,25 +114,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Die Aktualisierung konnte nicht berechnet werden."
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fehler beim authentifizieren einiger Pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -142,38 +142,38 @@
"das ein vorübergehendes Netzwerkproblem. Versuchen sie es später noch "
"einmal. Untenstehend ist die Liste der nicht authentifizierten Pakete."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Installation von '%s' nicht möglich"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -429,7 +429,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -449,7 +449,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Kann die Upgrades nicht downloaden."
@@ -461,33 +461,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Upgrade kann nicht installiert werden."
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -498,26 +498,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Veraltete Pakete löschen?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Löschen"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -525,45 +525,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Paketmanager wird überprüft"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -571,7 +571,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -580,23 +580,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Falsche Paketinformation"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -608,40 +608,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Suche nach veralteter Software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Systemupgrade fertiggestellt."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -670,80 +670,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Upgradeprogramm kann nicht ausgeführt werden"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Keen Togang"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifikatschoon fehlslagen"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -837,11 +837,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -849,11 +849,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -861,11 +861,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Keen init verföögbar"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -875,11 +875,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1565,11 +1565,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1637,20 +1637,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ne.po ubuntu-release-upgrader-17.10.1/po/ne.po
--- ubuntu-release-upgrader-17.04.7/po/ne.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ne.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ne\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s को लागि सर्भर"
@@ -29,31 +29,31 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "मुख्य सर्भर"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "पसन्द सर्भरहरू"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "श्रोत हरु calculate गर्न सकियेना अन्तिम खाका"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
"package files हरु कहाँ छन् पत्ता लगाउना सकियेना साएद को उबुन्टु को CD होइन"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "सीडी जोड्न अक्षम"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "खराब हालतको प्याकेज हटाउनुहोस्"
msgstr[1] "खराब हालतको प्याकेजहरू हटाउनुहोस्"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -89,15 +89,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "server ले थेग्न नसके जस्तो छ"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "टुक्रिएका प्याकेजहरू"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -106,7 +106,7 @@
"पहिला synaptic अथवा apt-get प्रयोग गर्नु होला"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -124,11 +124,11 @@
" * उबुन्टु द्वारा प्रदान नगरिएको अनौपचारिक सफ्टवेयर प्याकेजहरू\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "साएद समस्या थाही हैन होला फेरी प्रयास गर्नु होला"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -136,15 +136,15 @@
"यो कुनै पनि लागू हुदैन भने कृपया यो बगको रिपोर्ट गर्न 'ubuntu-bug ubuntu-"
"release-upgrader-core' कमान्ठको प्रयोग टर्मिनलमा गर्नु होला।"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "upgrade calculate गर्न सकियेना"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "केही प्याकेजहरू प्रमाणिकरणमा त्रुटि"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -154,29 +154,29 @@
"सक्छ। तपाईं पछि फेरि प्रयास गर्न सक्नुहुन्छ। \r\n"
"प्रमाणीकृत नभएको प्याकेजहरूको सूची लागि तल हेर्नुहोस्।"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"प्याकेज '%s' हटाउनका लागि चिह्नित गरेको छ तर यो हटाउने कालो सूचीमा छ।"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "आवश्यक प्याकेज '%s' हटाउनको लागि अंकित गरियेको छ।"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "कालो सुची मा परेको version '%s' प्रतिस्थापन गर्न खोजि दै छ"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' प्रतिस्थापन गर्न सकिएन"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -184,11 +184,11 @@
"यो आवश्यक प्याकेज स्थापना गर्न असम्भव थियो। कृपया बगको रिपोर्ट गर्न 'ubuntu-"
"bug ubuntu-release-upgrader-core' प्रयोग टर्मिनलमा गर्नु होला।"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "मेटा-प्याकेज अनुमान गर्न सकिँएन"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -441,7 +441,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -461,7 +461,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -473,33 +473,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -510,26 +510,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "राख्नुहोस्"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_हटाउनुहोस्"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -537,45 +537,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -583,7 +583,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -592,23 +592,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -620,40 +620,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "लिएर आउँदै"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "अद्यावधिक गरिदै"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "अद्यावधिक सकियो"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -682,80 +682,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "अपग्रेड औजार"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "लिएर आउन असफल भयो"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -849,11 +849,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -861,11 +861,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -873,11 +873,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -887,11 +887,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1566,11 +1566,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1638,20 +1638,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/nl.po ubuntu-release-upgrader-17.10.1/po/nl.po
--- ubuntu-release-upgrader-17.04.7/po/nl.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/nl.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server voor %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hoofdserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Aangepaste servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Berekenen van sources.list-vermelding is mislukt"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Geen pakketbestanden gevonden; mogelijk is dit geen Ubuntu-medium of "
"beschikt u niet over de juiste hardware-architectuur."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Toevoegen van de cd is mislukt"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"De foutmelding was:\n"
"‘%s’"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Pakket dat in slechte staat is verwijderen"
msgstr[1] "Pakketten die in slechte staat zijn verwijderen"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "De server is mogelijk overbelast"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Niet-werkende pakketten"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"verdergaat."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,13 +133,13 @@
" * Onofficiële softwarepakketten die niet door Ubuntu geleverd zijn.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Dit is waarschijnlijk een tijdelijk probleem.\r\n"
"Probeer het later nog eens."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -147,15 +147,15 @@
"Indien niets van dit alles van toepassing is, meld deze fout dan a.u.b. met "
"behulp van de terminalopdracht 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Berekenen van de opwaardering is mislukt"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Fout bij het bepalen van de echtheid van sommige pakketten"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -166,7 +166,7 @@
"proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet "
"vastgesteld is."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -174,23 +174,23 @@
"Het pakket ‘%s’ is gemarkeerd voor verwijdering, maar het staat op de zwarte "
"lijst voor verwijderen."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Het essentiële pakket ‘%s’ is gemarkeerd voor verwijdering."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Pakket (versie ‘%s’) dat op de zwarte lijst staat proberen te installeren"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Kan ‘%s’ niet installeren"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -199,11 +199,11 @@
"a.u.b. met behulp van de terminalopdracht 'ubuntu-bug ubuntu-release-"
"upgrader-core'."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Raden van het metapakket is mislukt"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -534,7 +534,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Wijzigingen worden berekend"
@@ -556,7 +556,7 @@
"wordt hersteld. U kunt de opwaardering op een later tijdstip hervatten."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Kon de opwaarderingsbestanden niet binnenhalen"
@@ -571,27 +571,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Fout bij het toepassen"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "De oorspronkelijke toestand wordt hersteld"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Installatie van de opwaarderingsbestanden is mislukt"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -600,7 +600,7 @@
"bevinden. Er zal nu een herstelprocedure uitgevoerd worden (dpkg --configure "
"-a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -617,7 +617,7 @@
"and voeg de bestanden in /var/log/dist-upgrade/ toe aan het foutrapport.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -625,20 +625,20 @@
"De opwaardering is afgebroken. Controleer a.u.b. uw internetverbinding of "
"installatiemedia en probeer het opnieuw. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Verouderde pakketten verwijderen?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Behouden"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Verwijderen"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -648,28 +648,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "De vereiste afhankelijkheden zijn niet geïnstalleerd"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Het vereiste pakket ‘%s’ is niet geïnstalleerd. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Pakketbeheerder controleren"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Voorbereiden van de opwaardering is mislukt"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -677,7 +677,7 @@
"Het voorbereiden van het systeem op de opwaardering is mislukt, dus wordt er "
"een foutrapportageproces gestart."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -686,13 +686,13 @@
"melden moet apport geïnstalleerd zijn en dient u 'apport-bug ubuntu-release-"
"upgrader' uit te voeren."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
"Het verkrijgen van de vooraf benodigde zaken voor de opwaardering is mislukt"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,7 +705,7 @@
"\n"
"Daarnaast wordt er een proces gestart voor de foutmelding."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -720,23 +720,23 @@
"Om een fout te melden moet apport geïnstalleerd zijn en dient u 'apport-bug "
"ubuntu-release-upgrader' uit te voeren."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Updaten van de informatie over de pakketbronnen"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Toevoegen van cdrom mislukt"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Helaas is het niet gelukt de cdrom toe te voegen"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ongeldige pakketinformatie"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -755,42 +755,42 @@
"In geval van een overbelaste spiegelserver, zou u op een later tijdstip de "
"opwaardering wederom kunnen proberen."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Ophalen"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Bezig met opwaarderen"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Opwaardering is voltooid"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"De opwaardering is voltooid, maar er hebben zich fouten voorgedaan tijdens "
"het opwaardeerproces."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Zoeken naar verouderde software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Systeemopwaardering is voltooid."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "De gedeeltelijke opwaardering werd voltooid."
@@ -819,17 +819,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "'%(file)s' tegen '%(signature)s' verifiëren "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "‘%s’ wordt uitgepakt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Uitvoering van het opwaardeerprogramma is mislukt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -838,29 +838,29 @@
"a.u.b. met behulp van de terminalopdracht 'ubuntu-bug ubuntu-release-"
"upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Handtekening opwaardeerprogramma"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Opwaardeerprogramma"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Ophalen is mislukt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Het ophalen van de opwaardering is mislukt. Er is mogelijk een "
"netwerkprobleem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Echtheidscontrole is mislukt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -868,11 +868,11 @@
"De echtheidscontrole van de opwaardering is mislukt. Er is mogelijk een "
"probleem met het netwerk of met de server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Uitpakken is mislukt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -880,11 +880,11 @@
"Het uitpakken van de opwaardering is mislukt. Er is mogelijk een probleem "
"met het netwerk of met de server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verificatie is mislukt"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -892,12 +892,12 @@
"Het verifiëren van de opwaardering is mislukt. Er is mogelijk een probleem "
"met het netwerk of met de server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Kan de opwaardering niet uitvoeren"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -906,7 +906,7 @@
"aangekoppeld. Koppel opnieuw aan zonder noexec en voer de opwaardering weer "
"uit."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "De foutmelding is ‘%s’."
@@ -1019,11 +1019,11 @@
"hardware werkt.\n"
"Wilt u doorgaan?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Geen i686-CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1035,11 +1035,11 @@
"hebben. Met deze apparatuur is het niet mogelijk om uw systeem op te "
"waarderen naar een nieuwe versie van Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Geen ARMv6-CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1051,11 +1051,11 @@
"met uw apparatuur niet mogelijk om uw systeem op te waarderen naar een "
"nieuwe versie van Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Geen init beschikbaar"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1071,11 +1071,11 @@
"\n"
"Weet u zeker dat u wilt doorgaan?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE is niet ingeschakeld"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1813,12 +1813,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Gereedschap voor versie-opwaardering aan het binnenhalen"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Controleer of opwaarderen naar de nieuwste ontwikkelversie mogelijk is"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1898,20 +1898,22 @@
msgstr ""
"Voer 'do-release-upgrade' uit om naar de nieuwe versie op te waarderen."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Updatebeheer"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Opwaardering naar Ubuntu %(version)s beschikbaar"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "U heeft besloten om niet te op te waarderen naar Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Debug-uitvoer toevoegen"
diff -Nru ubuntu-release-upgrader-17.04.7/po/nn.po ubuntu-release-upgrader-17.10.1/po/nn.po
--- ubuntu-release-upgrader-17.04.7/po/nn.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/nn.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,14 +15,14 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: nn\n"
"X-Language: nn_NO\n"
"X-Source-Language: C\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Tenar for %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hovudtenar"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Eigendefinerte tenarar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Klarte ikkje å rekna ut oppføringa i sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"Klarte ikkje å finna nokon pakkefiler. Kanskje dette ikkje er ein Ubuntu-"
"disk eller rett arkitektur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Klarte ikkje å leggja til CD-en"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,13 +70,13 @@
"Feilmeldinga var:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Fjern dårleg pakke"
msgstr[1] "Fjern dårlege pakkar"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Tenaren kan vera oppteken"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Skadde pakkar"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"programvara. Reparer dei med synaptic eller apt-get før du held fram."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -123,25 +123,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Dette er truleg berre eit kortvarig problem. Prøv om att seinare."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Klarte ikkje å førebu oppgraderinga"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Klarte ikkje å stadfesta identiteten åt somme pakkar"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -151,39 +151,39 @@
"nettverksproblem, så du bør prøve om att seinare. Sjå under for lista over "
"pakkar som ikkje kunne godkjennast."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Pakken '%s' er merkt for fjerning, men er i svartelista for fjerning."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Den nødvendige pakken «%s» er merkt for fjerning."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Freistar å installera den svartelista versjon '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Kan ikkje installera '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Klarte ikkje å gjetta på meta-pakke"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -482,7 +482,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Reknar ut endringane"
@@ -504,7 +504,7 @@
"atterreist. Du kan venda tilbake til oppgraderinga når som helst."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Klarte ikkje å lasta ned oppgraderingane"
@@ -519,27 +519,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Feil under innsending"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Gjenopprettar systemet til sin opphavlege tilstand"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Klarte ikkje å installera oppgraderingane"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -547,7 +547,7 @@
"Oppgraderinga vart avbroten. Systemet ditt kan vera ubrukeleg. Ei "
"gjenoppretting vert no køyrd (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -558,7 +558,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -566,20 +566,20 @@
"Oppgraderinga vart avbroten. Kontroller internett-tilkoplinga eller "
"installasjonsmediet og prøv på nytt. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ønskjer du å fjerna utdaterte pakkar?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Ta vare på"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Fjern"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -589,45 +589,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Nødvendige avhengnader er ikkje installerte"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Den nødvendige avhengnaden \"%s\" er ikkje installert. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Sjekkar pakkehandsamaren"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Klarte ikkje å førebu oppgraderinga"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Klarte ikkje å lasta ned oppgraderingskrava"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -635,7 +635,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -644,23 +644,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Oppdaterer informasjon om arkivet"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Klarte ikkje å leggja til CD-en"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Beklagar, å leggja til CD-en var mislukka."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ugyldig pakkeinformasjon"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -672,40 +672,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Hentar"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Oppgraderer"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Oppgradering fullført"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Oppgraderinga er ferdig, men nokre feil dukka opp under prosessen."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Søkjer etter utdatert programvare"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Systemoppgraderinga er fullført."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Delvis oppgradering er ferdig."
@@ -734,44 +734,44 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Klarte ikkje å køyra oppgraderingsverktøyet"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signaturen til oppgraderingsvertøyet"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Oppgraderingsvertøy"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Klarte ikkje å henta"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Klarte ikkje å henta oppgraderinga. Det kan vera eit nettverksproblem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Å stadfesta identiteten mislukkast"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -779,11 +779,11 @@
"Klarte ikkje å stadfesta identiteten til oppgraderinga. Det kan vere feil "
"med nettverket eller tenaren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Mislukkast i å pakka ut"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -791,11 +791,11 @@
"Klarte ikkje å pakka ut oppgraderinga. Det kan vera eit problem med "
"netverket eller tenaren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifiseringsfeil"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -803,12 +803,12 @@
"Å verifisera oppgraderinga mislukkast. Det kan vera ein feil med nettverket "
"eller tenaren. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Klarte ikkje å køyra oppgradering"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -816,7 +816,7 @@
"Dette skjer vanlegvis i system der mappa /tmp er montert med køyreløyve. "
"Monter på nytt utan køyreløyve og køyr oppgraderinga på nytt."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Feilmeldinga er «%s»."
@@ -914,11 +914,11 @@
"Datamaskina brukar AMD «fglrx»-grafikkdrivaren. Ingen tilgjengelege "
"versjonar av denne drivaren verkar med maskinvaren din i Ubuntu 10.04 LTS."
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ikkje ein i686-prosessor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -930,11 +930,11 @@
"oppgradera systemet ditt til den nyaste Ubuntu-utgjevinga med den noverande "
"maskinvaren."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ingen ARMv6-prosessor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -945,11 +945,11 @@
"pakkane i karmic krev minimum ARMv6. Det er ikkje mogleg å oppgradera "
"systemet ditt til den nyaste Ubuntu-utgjevinga med den noverande maskinvaren."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Ingen oppstartsprogram (init) er tilgjengelege"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -965,11 +965,11 @@
"\n"
"Er du sikker på at du vil halda fram?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1688,11 +1688,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Lastar ned oppgraderingverktøyet"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Sjekk om ei oppgradering til den siste utviklarversjonen er mogeleg"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1771,20 +1771,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Køyr «do-release-upgrade» for å oppgradera til henne."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Oppgradering tilgjengeleg: Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Du har takka nei til å oppgradera åt Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/oc.po ubuntu-release-upgrader-17.10.1/po/oc.po
--- ubuntu-release-upgrader-17.04.7/po/oc.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/oc.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor per %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidors personalizats"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Impossible d'avalorar la linha de source.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Impossible de localizar los fichièrs dels paquets. Benlèu es pas un disc "
"Ubuntu, o alara es previst per una autra arquitectura."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Impossible d'apondre lo CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Lo messatge d'error èra :\n"
"« %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Suprimir lo paquet damatjat"
msgstr[1] "Suprimir los paquets damatjats"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Benlèu que lo servidor es subrecarga"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paquets copats"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"corregir. Corrigissètz-los amb synaptic o apt-get abans de contunhar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -131,12 +131,12 @@
" * de paquets logicials non oficials, pas provesits per Ubuntu.\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Aquò se sembla fòrça a un problèma temporari. Tornatz ensajar pus tard."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -144,15 +144,15 @@
"Se res de tot aquò s'aplica pas, senhalatz aqueste bug en utilizant la "
"comanda 'ubuntu-bug ubuntu-release-upgrader-core' dins un terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Impossible de calcular la mesa a jorn"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error al moment de l'autentificacion d'unes paquets"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -162,7 +162,7 @@
"problèma temporari de la ret. Pòt èsser util de tornar ensajar mai tard. "
"Trobaretz çaijós una lista dels paquets pas autentificats."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -170,22 +170,22 @@
"Lo paquet « %s » es marcat per supression mas es dins la lista negra de las "
"supressions."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Lo paquet essencial « %s » es marcat per supression."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Temptativa d'installacion de la version en lista d'exclusion « %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Impossible d'installar « %s »"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -194,11 +194,11 @@
"utilizant la comanda 'ubuntu-bug ubuntu-release-upgrader-core' dins un "
"terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Impossible de determinar lo metapaquet"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -530,7 +530,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calcul de las modificacions"
@@ -552,7 +552,7 @@
"restablit. La podètz reprene pus tard."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Impossible de telecargar las mesas a jorn"
@@ -567,27 +567,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error pendent la somission"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restabliment del sistèma dins son estat d'origina"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Impossible d'installar las mesas a jorn"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -595,7 +595,7 @@
"La mesa a nivèl a fracassat. Vòstre sistèma poiriá èsser inutilizable. Ara, "
"una temptativa de recuperacion se va debanar (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -612,7 +612,7 @@
"jonhètz al rapòrt los fichièrs que se tròban dins /var/log/dist-upgrade/ .\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -620,20 +620,20 @@
"La mesa a nivèl a fracassat. Verificatz vòstra connexion Internet e lo "
"supòrt d'installacion abans de tornar ensajar. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Suprimir los paquets obsolèts ?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Conservar"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Suprimir"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -643,28 +643,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Dependéncia requesida pas installada"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dependéncia requesida « %s » es pas installada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Verificacion del gestionari de paquets"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Preparacion de la mesa a jorn impossibla"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -672,7 +672,7 @@
"La preparacion del sistèma per la mesa a nivèl a fracassat. Un processus de "
"rapòrt d'incident es doncas inicializat."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -681,12 +681,12 @@
"bug, installatz « apport » puèi executatz « apport-bug ubuntu-release-"
"upgrader »."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Impossible d'obténer los prerequesits necessaris a la mesa a jorn"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -697,7 +697,7 @@
"mesa a nivèl se va arrestar e restablir lo sistèma dins son estat inicial.\n"
"En complement, un processus de rapòrt d'incident es inicializat."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -709,23 +709,23 @@
"La mesa a nivèl va èsser abandonada e lo sistèma serà restablit a son estat "
"d'origina."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Mesa a jorn de las informacions suls depauses"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Impossible d'apondre lo CD"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "O planhèm, l'apondon del CD a fracassat."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informacions suls paquets invalidas"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -744,42 +744,42 @@
"Dins lo cas d'un miralh subrecargat, poiretz ensajar tornarmai la mesa a "
"jorn pus tard."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Recuperacion"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Mesa a nivèl"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Mesa a nivèl acabada"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"La mesa a nivèl es acabada, mas d'errors se son produchas al moment "
"d'aqueste processus de mesa a nivèl."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Recèrca de logicials obsolets"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "La mesa a nivèl del sistèma es acabada."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "La mesa a nivèl parciala del sistèma es acabada."
@@ -808,17 +808,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autentificacion de '%(file)s' amb '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extraccion de '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Impossible d'aviar l'esplech de mesa a nivèl"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -826,29 +826,29 @@
"Aquò's probablament un bug dins l'aisina de mesa a nivèl. Senhalatz-lo coma "
"un bug en utilizant la comanda 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signatura de l'esplech de mesa a jorn"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Esplech de mesa a jorn"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Recuperacion impossibla"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"La recuperacion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma de "
"ret. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "L'autentificacion a fracassat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -856,11 +856,11 @@
"L'autentificacion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma "
"de ret o de servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Extraccion impossibla"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -868,11 +868,11 @@
"L'extraccion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma de "
"ret o de servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "La verificacion a fracassat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -880,12 +880,12 @@
"La verificacion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma de "
"ret o de servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Impossible d'aviar la mesa a nivèl"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -893,7 +893,7 @@
"De costuma, aquò es degut a un sistèma o /tmp montat en mòde noexec. "
"Remontatz-lo sens l'opcion noexec e metètz a jorn tornarmai."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Lo messatge d'error es « %s »."
@@ -1009,11 +1009,11 @@
"\n"
"Volètz contunhar ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Pas de processor i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1026,11 +1026,11 @@
"a jorn vòstre sistèma cap a una novèla version d'Ubuntu amb vòstre material "
"actual."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Pas de processor ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1042,11 +1042,11 @@
"necessitan al minimum una arquitectura ARMv6. Es impossible de metre a nivèl "
"vòstre sistèma cap a la version novèla d'Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Inicializacion indisponibla"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1062,11 +1062,11 @@
"\n"
"Sètz segur que volètz contunhar ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE pas activat"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1807,13 +1807,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Telecargament de l'esplech de mesa a jorn de distribucion"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Verificar se la mesa a nivèl cap a la darrièra version de desvolopament es "
"possibla"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1893,20 +1893,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Aviar « do-release-upgrade » per metre a nivèl cap a aquesta."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Gestionari de mesas a jorn"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Mesa a nivèl cap a Ubuntu %(version)s disponibla"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Avètz declinada la mesa a jorn cap a Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Apondre la sortida de desbugatge"
diff -Nru ubuntu-release-upgrader-17.04.7/po/om.po ubuntu-release-upgrader-17.10.1/po/om.po
--- ubuntu-release-upgrader-17.04.7/po/om.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/om.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,11 +15,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -27,30 +27,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -60,13 +60,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -81,22 +81,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -107,63 +107,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -414,7 +414,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -434,7 +434,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -446,33 +446,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -483,26 +483,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -510,45 +510,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -556,7 +556,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -565,23 +565,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -593,40 +593,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -655,80 +655,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -822,11 +822,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -834,11 +834,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -846,11 +846,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -860,11 +860,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1539,11 +1539,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1611,19 +1611,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/pam.po ubuntu-release-upgrader-17.10.1/po/pam.po
--- ubuntu-release-upgrader-17.04.7/po/pam.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/pam.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,11 +15,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -27,30 +27,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -60,13 +60,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -81,22 +81,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -107,63 +107,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -414,7 +414,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -434,7 +434,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -446,33 +446,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -483,26 +483,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -510,45 +510,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -556,7 +556,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -565,23 +565,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -593,40 +593,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -655,80 +655,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -822,11 +822,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -834,11 +834,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -846,11 +846,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -860,11 +860,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1539,11 +1539,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1611,19 +1611,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/pa.po ubuntu-release-upgrader-17.10.1/po/pa.po
--- ubuntu-release-upgrader-17.04.7/po/pa.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/pa.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s ਲਈ ਸਰਵਰ"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ਮੇਨ ਸਰਵਰ"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "ਪਸੰਦੀਦਾ ਸਰਵਰ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list ਐਂਟਰੀ ਗਿਣੀ ਨਹੀਂ ਜਾ ਸਕੀ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"ਕੋਈ ਵੀ ਪੈਕੇਜ ਫਾਇਲ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ, ਸ਼ਾਇਧ ਇਹ ਉਬਤੂੰ ਡਿਸਕ ਨਹੀਂ ਹੈ ਜਾਂ ਗਲਤ "
"ਢਾਂਚਾ ਹੈ?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "ਸੀਡੀ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -64,13 +64,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "ਖਰਾਬ ਹਾਲਤ ਦੇ ਪੈਕੇਜ ਹਟਾਓ"
msgstr[1] "ਖਰਾਬ ਹਾਲਤ ਦੇ ਪੈਕੇਜ ਹਟਾਓ"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -85,22 +85,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "ਖ਼ਰਾਬ ਪੈਕੇਜ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -111,63 +111,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "ਅੱਪਗਰੇਡ ਦੀ ਗਣਨਾ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "ਕੁਝ ਪੈਕੇਜ ਪਰਮਾਣਿਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "ਲਾਜ਼ਮੀ ਪੈਕੇਜ '%s' ਹਟਾਉਣ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਗਿਆ ਹੈ।"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "ਬਲੈਕ-ਲਿਸਟ ਕੀਤਾ ਵਰਜਨ '%s' ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -422,7 +422,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "ਬਦਲਾਅ ਲਈ ਗਿਣਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
@@ -442,7 +442,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "ਅੱਪਗਰੇਡ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ"
@@ -454,33 +454,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "ਕਮਿਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "ਸਿਸਟਮ ਅਸਲੀ ਹਾਲਤ ਵਿੱਚ ਮੁੜ-ਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "ਅੱਪਗਰੇਡ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -491,7 +491,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -499,20 +499,20 @@
"ਅੱਪਗਰੇਡ ਨੂੰ ਅਧੂਰਾ ਛੱਡਿਆ ਗਿਆ। ਆਪਣੇ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਜਾਂ ਇੰਸਟਾਲ ਮੀਡਿਏ ਦੀ ਜਾਂਚ "
"ਕਰੋ ਤੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ। "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "ਬਰਤਰਫ਼ ਹੋਏ ਪੈਕੇਜ ਹਟਾਉਣੇ ਹਨ?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "ਰੱਖੋ(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "ਹਟਾਓ(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -521,45 +521,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "ਲੋੜੀਦੀ ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "ਲੋੜੀਂਦੀ ਨਿਰਭਰਤਾ '%s' ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "ਪੈਕੇਜ ਮੈਨੇਜਰ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "ਅੱਪਗਰੇਡ ਲਈ ਤਿਆਰ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -567,7 +567,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -576,23 +576,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "ਰਿਪੋਜ਼ਟਰੀ ਜਾਣਕਾਰੀ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ਗਲਤ ਪੈਕੇਜ ਜਾਣਕਾਰੀ"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -604,40 +604,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "ਲਈ ਜਾ ਰਹੀ ਹੈ"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "ਅੱਪਗਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "ਅੱਪਗਰੇਡ ਪੂਰਾ ਹੋਇਆ"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "ਅੱਪਗਰੇਡ ਪੂਰਾ ਚੁੱਕਾ ਹੈ, ਪਰ ਅੱਪਗਰੇਡ ਕਾਰਵਾਈ ਦੌਰਾਨ ਗਲਤੀਆਂ ਆਈਆਂ ਹਨ।"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "ਬਰਤਰਫ਼ ਸਾਫਟਵੇਅਰ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "ਸਿਸਟਮ ਅੱਪਗਰੇਡ ਪੂਰਾ ਹੋਇਆ।"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "ਅਧੂਰਾ ਅੱਪਗਰੇਡ ਪੂਰਾ ਹੋ ਗਿਆ।"
@@ -666,80 +666,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' ਨੂੰ ਖਿਲਾਰਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "ਅੱਪਗਰੇਡ ਟੂਲ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "ਅੱਪਗਰੇਡ ਟੂਲ ਦਸਤਖਤ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "ਅੱਪਗਰੇਡ ਟੂਲ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "ਅੱਪਗਰੇਡ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ। ਨੈੱਟਵਰਕ ਸਮੱਸਿਆ ਹੋ ਸਕਦੀ ਹੈ। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "ਖਿਲਾਰਨ ਲਈ ਫੇਲ੍ਹ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "ਜਾਂਚ ਫੇਲ੍ਹ ਹੋਈ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "ਅੱਪਗਰੇਡ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "ਗਲਤੀ ਸੁਨੇਹਾ '%s' ਹੈ।"
@@ -833,11 +833,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 CPU ਨਹੀਂ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -845,11 +845,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 CPU ਨਹੀਂ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -857,11 +857,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init ਮੌਜੂਦ ਨਹੀਂ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -871,11 +871,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1573,11 +1573,11 @@
msgid "Downloading the release upgrade tool"
msgstr "ਰੀਲਿਜ਼ ਅੱਪਗਰੇਡ ਟੂਲ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਜੇ ਨਵੇਂ ਡਿਵੈਲ ਰੀਲਿਜ਼ ਲਈ ਅੱਪਗਰੇਡ ਸੰਭਵ ਹੈ"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1650,20 +1650,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟਰ"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "ਉਬਤੂੰ %(version)s ਅੱਪਗਰੇਡ ਲਈ ਉਪਲੱਬਧ ਹੈ"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "ਤੁਸੀਂ ਉਬੰਤੂ %s ਲਈ ਅੱਪਗਰੇਡ ਕਰਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/pl.po ubuntu-release-upgrader-17.10.1/po/pl.po
--- ubuntu-release-upgrader-17.04.7/po/pl.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/pl.po 2017-04-24 21:05:20.000000000 +0000
@@ -22,12 +22,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: pl\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Serwer dla kraju %s"
@@ -35,20 +35,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Główny serwer"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Inne serwery"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nie można obliczyć wpisu w sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -56,11 +56,11 @@
"Nie można odnaleźć żadnych plików z pakietami. Może nie jest to płyta z "
"Ubuntu lub architektura komputera jest nieprawidłowa?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Nie udało się dodać płyty CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -76,14 +76,14 @@
"Komunikat błędu jest następujący:\n"
"„%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Usuwanie uszkodzonego pakietu"
msgstr[1] "Usuwanie uszkodzonych pakietów"
msgstr[2] "Usuwanie uszkodzonych pakietów"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -108,15 +108,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Serwer może być przeciążony"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Uszkodzone pakiety"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -125,7 +125,7 @@
"kontynuowaniem należy je naprawić używając programu Synaptic lub apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -143,11 +143,11 @@
"* Nieoficjalne pakiety oprogramowania niedostarczane przez Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Wystąpiły przejściowe trudności. Proszę spróbować później."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -155,15 +155,15 @@
"Jeśli żadna z wymienionych sytuacji nie ma miejsca, proszę zgłosić ten błąd "
"wprowadzając w terminalu polecenie „ubuntu-bug ubuntu-release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nie można przetworzyć aktualizacji"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Błąd uwierzytelenienia pakietów"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -173,7 +173,7 @@
"chwilowy błąd sieci. Można spróbować ponownie później. Poniżej znajduje się "
"lista nieuwierzytelnionych pakietów."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -181,23 +181,23 @@
"Pakiet \"%s\" jest oznaczony do usunięcia, lecz znajduje się na liście "
"pakietów, których nie należy usuwać."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Niezbędny pakiet \"%s\" jest oznaczony do usunięcia."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Próbowanie zainstalowania wersji „%s”, znajdującej się na czarnej liście"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nie można zainstalować „%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -205,11 +205,11 @@
"Zainstalowanie wymaganego pakietu było niemożliwe. Proszę zgłosić ten błąd "
"wprowadzając w terminalu polecenie „ubuntu-bug ubuntu-release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nie można określić meta-pakietu"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -548,7 +548,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Przetwarzanie zmian"
@@ -570,7 +570,7 @@
"stanu. W późniejszym czasie można ponowić próbę aktualizacji wydania."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Pobranie aktualizacji było niemożliwe"
@@ -585,27 +585,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Błąd podczas zatwierdzania"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Przywracanie pierwotnego stanu systemu"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nie można zainstalować aktualizacji"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -614,7 +614,7 @@
"nienadającym się do użytku. Zostanie teraz uruchomione odzyskiwanie (dpkg --"
"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -631,7 +631,7 @@
"and attach the files in /var/log/dist-upgrade/\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -639,20 +639,20 @@
"Aktualizacja została przerwana. Proszę sprawdzić połączenie internetowe lub "
"nośnik instalacyjny i spróbować ponownie. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Usunąć przestarzałe pakiety?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Zachowaj"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Usuń"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -660,28 +660,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Wymagana zależność nie jest zainstalowana."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Wymagana zależność \"%s\" nie jest zainstalowana. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Sprawdzanie menedżera pakietów"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Przygotowanie aktualizacji nie powiodło się"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -689,7 +689,7 @@
"Przygotowanie systemu do aktualizacji nie powiodło się. Zostanie uruchomiony "
"proces raportowania błędów."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -698,12 +698,12 @@
"zainstalować program apport i wykonać polecenie „apport-bug ubuntu-release-"
"upgrader”."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Pobranie elementów wymaganych do aktualizacji nie powiodło się"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -715,7 +715,7 @@
"\n"
"Następnie uruchomiony zostanie proces raportowania błędów."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -729,23 +729,23 @@
"Aby zgłosić błąd, zainstaluj apport, następnie wykonaj 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Aktualizowanie informacji o repozytoriach"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Dodanie CD-ROM nieudane"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Dodanie napędu CD-ROM zakończone niepowodzeniem"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Błędne informacje o pakietach"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -764,41 +764,41 @@
"W przypadku przeciążenia serwerów lustrzanych, warto spróbować uaktualnienia "
"później."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Pobieranie"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Aktualizacja w toku"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Aktualizacja ukończona"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Aktualizacja została zakończona, lecz wystąpiły błędy podczas tego procesu."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Wyszukiwanie przestarzałego oprogramowania"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Aktualizacja systemu zakończona powodzeniem."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Częściowa aktualizacja została ukończona"
@@ -827,17 +827,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "uwierzytelnianie '%(file)s' przed '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "Wypakowywanie '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nie można było uruchomić narzędzia aktualizacji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -845,28 +845,28 @@
"Prawdopodobnie wystąpił błąd narzędzia aktualizacji. Proszę zgłosić go, "
"używając komendy \"ubuntu-bug ubuntu-release-upgrader-core\""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Podpis narzędzia aktualizacji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Narzędzie aktualizacji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Pobieranie nie powiodło się"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Pobieranie aktualizacji nie powiodło się. Może to oznaczać problem z siecią. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Uwierzytelnienie nie powiodło się"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -874,11 +874,11 @@
"Uwierzytelnienie aktualizacji nie powiodło się. Mógł wystąpić problem z "
"siecią lub z serwerem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Rozpakowywanie nie powiodło się"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -886,11 +886,11 @@
"Rozpakowywanie aktualizacji nie powiodło się. Mógł wystąpić problem z siecią "
"lub z serwerem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Weryfikacja nie powiodła się"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -898,12 +898,12 @@
"Weryfikacja aktualizacji nie powiodła się. Mógł wystąpić problem z siecią "
"lub z serwerem. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nie można rozpocząć aktualizacji"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -912,7 +912,7 @@
"zamontowany z opcją noexec. Proszę zamontować go ponownie bez opcji noexec i "
"uruchomić aktualizację ponownie."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Treść komunikatu błędu: \\\"%s\\\""
@@ -1025,11 +1025,11 @@
"\n"
"Kontynuować?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Brak procesora o architekturze i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1041,11 +1041,11 @@
"optymalizacje wymagające minimum architektury i686. Na tym sprzęcie "
"niemożliwa jest aktualizacja twojego systemu do nowego wydania Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Brak procesora ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1057,11 +1057,11 @@
"architektury ARMv6. Nie ma możliwości aktualizacji systemu do nowego wydania "
"na tym sprzęcie."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Brak dostępnego procesu init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1075,11 +1075,11 @@
"tym typem środowiska, wymagając najpierw aktualizacji konfiguracji maszyny "
"wirtualnej."
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nie jest włączony"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1824,11 +1824,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Pobieranie narzędzia aktualizacji wydania"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Sprawdź możliwość aktualizacji do najnowszej wersji testowej"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1906,20 +1906,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Proszę uruchomić \"do-release-upgrade\", aby zaktualizować."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Aktualizacje oprogramowania"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Dostępna jest aktualizacja do Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Zrezygnowano z aktualizacji do Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Dodaj informacje wyjściowe debugowania"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ps.po ubuntu-release-upgrader-17.10.1/po/ps.po
--- ubuntu-release-upgrader-17.04.7/po/ps.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ps.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/pt_BR.po ubuntu-release-upgrader-17.10.1/po/pt_BR.po
--- ubuntu-release-upgrader-17.04.7/po/pt_BR.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/pt_BR.po 2017-04-24 21:05:20.000000000 +0000
@@ -13,14 +13,14 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"X-Poedit-Country: BRAZIL\n"
"Language: \n"
"X-Poedit-Language: Portuguese\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor para %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidores personalizados"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Não foi possível calcular a entrada de source.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Não foi possível localizar qualquer arquivo do pacote. Talvez este não seja "
"um disco do Ubuntu ou tenha uma arquitetura diferente?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Falha ao adicionar o CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Mensagem de erro:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remover pacote danificado"
msgstr[1] "Remover pacotes danificados"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "O servidor pode estar sobrecarregado"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -113,7 +113,7 @@
"antes de continuar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -131,12 +131,12 @@
" * Uso de pacotes não-oficiais e não fornecidos pelo Ubuntu;\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Provavelmente este problema é temporário. Por favor, tente mais tarde."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -144,15 +144,15 @@
"Se nada disso se aplicar, relate esse erro usando o comando 'ubuntu-bug "
"ubuntu-release-upgrader-core' no terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Não foi possível calcular a atualização"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Erro na autenticação de alguns pacotes"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -162,7 +162,7 @@
"problema na rede. Você pode tentar novamente mais tarde. Veja abaixo uma "
"lista dos pacotes não-autenticados."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -170,22 +170,22 @@
"O pacote '%s' está marcado para remoção, mas ele está na lista-negra de "
"remoção."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "O pacote essencial '%s' está marcado para remoção."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Tentando instalar uma versão marcada como banida: '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Não é possível instalar '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -193,11 +193,11 @@
"Foi impossível instalar o pacote requerido. Por favor, relate esse erro "
"usando 'ubuntu-bug ubuntu-release-upgrader-core' no terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Não foi possível adivinhar o meta-pacote"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -526,7 +526,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Calculando as mudanças"
@@ -548,7 +548,7 @@
"restaurado. Você pode continuá-la em um outro momento."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Não foi possível baixar as atualizações"
@@ -563,27 +563,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Erro ao aplicar as mudanças"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Restaurando o estado original do sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Não foi possível instalar as atualizações"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -591,7 +591,7 @@
"A atualização foi cancelada. Seu sistema pode estar inutilizável. Um "
"processo de recuperação será executado agora (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -608,7 +608,7 @@
"anexe os arquivos em /var/log/dist-upgrade/ ao relatório de erro.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -616,20 +616,20 @@
"A atualização foi cancelada. Por favor verifique sua conexão com a internet "
"ou a mídia de instalação e tente novamente "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Remover pacotes obsoletos?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Manter"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Remover"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -639,28 +639,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Dependências requeridas não estão instaladas"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "A dependência requerida '%s' não está instalada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Verificando o Gerenciador de pacotes"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "A preparação para a atualização falhou"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -668,7 +668,7 @@
"Falha na preparação do sistema para atualização, portanto um processo de "
"relatório de erros está sendo iniciado."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -676,12 +676,12 @@
"A preparação para a atualização do sistema falhou. Para relatar um erro, "
"instale apport e em seguida execute 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Falha ao obter os pré-requisitos para atualização"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -693,7 +693,7 @@
"\n"
"Além disso, um processo de relatório de erro está sendo iniciado."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -707,23 +707,23 @@
"Para reportar um erro, instale o apport e então execute 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Atualizando informação do repositório"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Falha ao adicionar cd-rom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Desculpe, a inclusão do cd-rom não foi bem sucedida."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informação do pacote inválida"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -735,42 +735,42 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Obtendo"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Atualizando"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Atualização completa"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"A atualização foi concluída mas houve erros durante o processo de "
"atualização."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Buscando programas obsoletos"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "A atualização do sistema está completa."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "A atualização parcial está completa."
@@ -799,17 +799,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autenticar os '%(file)s' contra as '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extraindo '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Não foi possível executar a ferramenta de atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -818,27 +818,27 @@
"reporte-o como um erro usando o comando 'ubuntu-bug ubuntu-release-upgrader-"
"core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Assinatura da ferramenta de atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Ferramenta de atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Falha ao obter"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Falha ao obter a atualização. Pode ser algum problema com a rede. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Falha na autenticação"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -846,11 +846,11 @@
"Falha ao autenticar a atualização. Pode ser um problema com a rede ou com o "
"servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Falha ao extrair"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -858,11 +858,11 @@
"Falha ao extrair a atualização. Pode ser um problema com a rede ou com o "
"servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Falha na verificação"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -870,12 +870,12 @@
"Falha ao verificar atualização. Pode ser um problema com a rede ou com o "
"servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Não foi possível executar a ferramenta de atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -883,7 +883,7 @@
"Isso é causado normalmente por um sistema onde /tmp é montado com noexec. "
"Por favor, remonte sem noexec e execute a atualização novamente."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "A mensagem de erro é '%s'."
@@ -997,11 +997,11 @@
"\n"
"Você deseja continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Sem processador i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1013,11 +1013,11 @@
"requerem i686 como arquitetura mínima. Não é possível atualizar seu sistema "
"para uma nova versão do Ubuntu nesse computador."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nenhuma CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1029,11 +1029,11 @@
"mínimo a arquitetura ARMv6. Não é possível atualizar seu sistema para uma "
"versão mais nova do Ubuntu com este hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Sem inicialização disponível"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1049,11 +1049,11 @@
"\n"
"Você tem certeza que deseja continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE não habilitado"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1786,13 +1786,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Baixando a ferramenta de atualização"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Verificar se é possível atualizar para a versão de desenvolvimento mais "
"recente"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1870,20 +1870,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Execute 'do-release-upgrade' para atualizá-lo."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Atualizador de programas"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Atualização do Ubuntu %(version)s disponível"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Você desistiu de atualizar para o Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Adicionar saída de depuração"
diff -Nru ubuntu-release-upgrader-17.04.7/po/pt.po ubuntu-release-upgrader-17.10.1/po/pt.po
--- ubuntu-release-upgrader-17.04.7/po/pt.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/pt.po 2017-04-24 21:05:20.000000000 +0000
@@ -14,12 +14,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Servidor para %s"
@@ -27,20 +27,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Servidor principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servidores personalizados"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Não foi possivel calcular a entrada sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -48,11 +48,11 @@
"Não foi possível localizar quaisquer ficheiros de pacote, não é um Disco "
"Ubuntu ou tem a arquitetura errada?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Falha ao adicionar o CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,13 +67,13 @@
"A mensagem de erro foi:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remover o pacote em mau estado"
msgstr[1] "Remover os pacotes em mau estado"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -94,15 +94,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "O servidor pode estar sobrecarregado"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"continuar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,12 +130,12 @@
" * Ter pacotes de software não oficiais, que não são fornecidos pelo Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Isto é provavelmente um problema temporário, por favor tente mais tarde."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Se nada disto se aplica, então por favor, relate este erro usando o comando "
"\"ubuntu-bug ubuntu-release-upgrader-core ' no terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Impossível calcular a atualização de versão"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Erro ao autenticar alguns pacotes"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,29 +161,29 @@
"rede temporário. Tente novamente mais tarde. Verifique abaixo uma lista de "
"pacotes não autenticados."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"O pacote '%s' está marcado para remoção mas está na lista negra de remoção."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "O pacote essencial '%s' está marcado para remoção."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Tentando instalar a versão '%s' da lista negra"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Impossível instalar '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -192,11 +192,11 @@
"um bug usando o comando 'ubuntu-bug ubuntu-release-upgrader-core' no "
"terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Impossível descobrir meta-pacote"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -527,7 +527,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "A aplicar as alterações"
@@ -549,7 +549,7 @@
"retomar esta actualização posteriormente."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Impossível descarregar as atualizações"
@@ -564,27 +564,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Erro ao submeter"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "A restaurar o estado original do sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Impossível instalar as atualizações"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -592,7 +592,7 @@
"A atualização foi abortada. O seu sistema pode encontrar-se num estado não "
"utilizável. Uma recuperação vai correr agora (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -609,7 +609,7 @@
"anexe os ficheiros em /var/log/dist-upgrade/ ao relatório de bug.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -617,20 +617,20 @@
"A atualização de versão foi abortada. Por favor, verifique a sua ligação à "
"Internet ou o seu meio de instalação e tente novamente. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Remover pacotes obsoletos?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Manter"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Remover"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -640,28 +640,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "A dependência requerida não foi instalada"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "A dependência '%s' requerida não foi instalada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "A verificar gestor de pacotes"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "A preparação da atualização de versão falhou"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -669,7 +669,7 @@
"A preparação do sistema para a atualização falhou, por isso um processo de "
"denúncia de bug foi iniciado."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -677,12 +677,12 @@
"A preparação do sistema para a atualização, falhou. Para reportar um bug "
"instale o apport e de seguida execute o 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Falhou a obtenção do pré-requisitos da atualização de versão"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -694,7 +694,7 @@
"\n"
"Adicionalmente, um processo de denúncia de bug foi iniciado."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -709,23 +709,23 @@
"Para reportar um bug instale o apport e de seguida execute o 'apport-bug "
"ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "A atualizar informação de repositórios"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Falhou a adicionar o CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Desculpe, mas a adição do CD-ROM não foi bem sucedida."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informação de pacotes inválida"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -743,42 +743,42 @@
"No caso de ser tráfego excessivo na fonte, poderá tentar novamente mais "
"tarde."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "A recolher"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "A atualizar"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Atualização concluída"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"A atualização da versão do sistema foi concluída, mas ocorreram erros "
"durante o processo."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "À procura de software obsoleto"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "A atualização da versão do sistema foi concluída."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "A atualização parcial de versão foi concluída."
@@ -807,17 +807,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "Autenticar '%(file)s' contra '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "a extrair '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Impossível de executar a ferramenta de atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -826,28 +826,28 @@
"comunique-o como um bug usando o comando \"ubuntu-bug ubuntu-release-"
"upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Assinatura da ferramenta de atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Ferramenta de atualização de versão"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Falha a obter"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Falhou ao obter a atualização de versão. Poderá existir um problema de rede. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autenticação falhou"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -855,11 +855,11 @@
"Autenticação da atualização falhou. Poderá existir um problema com a rede ou "
"com o servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Falhou ao extrair"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -867,11 +867,11 @@
"Extracção da atualização de versão falhou. Poderá existir um problema com a "
"rede ou com o servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "A verificação falhou"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -879,12 +879,12 @@
"A verificação da atualização falhou. Poderá existir um problema com a rede "
"ou com o servidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Impossível executar a atualização"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -892,7 +892,7 @@
"Isto é normalmente causado por um sistema onde /tmp está montado noexec. Por "
"favor, remonte sem noexec e corra a atualização novamente."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "A mensagem de erro é '%s'."
@@ -1005,11 +1005,11 @@
"\n"
"Pretende continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Nenhum CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1021,11 +1021,11 @@
"i686 mínima. Não é possível atualizar o seu sistema para a nova versão do "
"Ubuntu com o hardware atual."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Sem CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1037,11 +1037,11 @@
"mínima. Não é possível fazer upgrade para uma nova versão de Ubuntu com este "
"hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Sem inicialização disponível"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1057,11 +1057,11 @@
"\n"
"De certeza que quer continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE não ativo"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1794,12 +1794,12 @@
msgid "Downloading the release upgrade tool"
msgstr "A descarregar a ferramenta de atualização da nova versão"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Verifique se é possível atualizar para a última versão em desenvolvimento"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1879,20 +1879,22 @@
msgstr ""
"Correr 'do-release-upgrade' para atualizar para o lançamento mais recente."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Atualizações"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Atualização Ubuntu %(version)s disponível"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Você não aceitou a atualização para o Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Adicionar saída de depuração"
diff -Nru ubuntu-release-upgrader-17.04.7/po/qu.po ubuntu-release-upgrader-17.10.1/po/qu.po
--- ubuntu-release-upgrader-17.04.7/po/qu.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/qu.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: qu\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ro.po ubuntu-release-upgrader-17.10.1/po/ro.po
--- ubuntu-release-upgrader-17.04.7/po/ro.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ro.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ro\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server pentru %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Server principal"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servere preferențiale"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nu s-a putut calcula intrarea sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Nu s-au găsit pachete, poate că acesta nu e un disc Ubuntu sau este pentru o "
"altă arhitectură?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Adăugarea CD-ului a eșuat"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,14 +69,14 @@
"Mesajul de eroare a fost:\n"
"„%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Șterge pachetul aflat într-o stare eronată"
msgstr[1] "Șterge pachetele aflate într-o stare eronată"
msgstr[2] "Șterge pachetele aflate într-o stare eronată"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +101,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "S-ar putea ca serverul să fie suprasolicitat"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -118,7 +118,7 @@
"program. Înainte de a continua, remediați-le utilizând Synaptic sau apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -136,11 +136,11 @@
" * Pachete software neoficiale, care nu sunt furnizate de Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Cel mai probabil este o problemă trecătoare, încercați mai târziu."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -149,15 +149,15 @@
"acest defect de programare utilizând în Terminal comanda „ubuntu-bug ubuntu-"
"release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nu s-a putut calcula înnoirea"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Eroare la validarea unor pachete"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -167,7 +167,7 @@
"probleme temporare ale rețelei. Puteți încerca mai târziu. Aveți mai jos o "
"listă a pachetelor neautentificate."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -175,24 +175,24 @@
"Pachetul „%s” este marcat pentru eliminare, dar este pe lista de interzicere "
"de eliminare."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Pachetul esențial „%s” este marcat pentru eliminare."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
"Se încearcă instalarea versiunii „%s” care este pe lista versiunilor "
"interzise la instalare"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nu s-a putut instala „%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -201,11 +201,11 @@
"acest defect de programare utilizând în Terminal comanda „ubuntu-bug ubuntu-"
"release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nu s-a putut ghici meta-pachetul"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -540,7 +540,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Se calculează modificările"
@@ -562,7 +562,7 @@
"Puteți relua înnoirea mai târziu."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nu s-au putut descărca înnoirile"
@@ -577,27 +577,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Eroare în timpul comiterii"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Se revine la starea inițială a sistemului"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nu s-au putut instala înnoirile"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -605,7 +605,7 @@
"Înnoirea a fost abandonată. Sistemul dumneavoastră ar putea fi într-o stare "
"inutilizabilă. Va fi executată o recuperare (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -622,7 +622,7 @@
"atașând raportului și fișierele din /var/log/dist-upgrade/.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -630,20 +630,20 @@
"Înnoirea a fost abandonată. Verificați conexiunea la internet sau mediile de "
"instalare și reîncercați. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ștergeți pachetele învechite?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Păstrează"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Elimină"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -653,28 +653,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "O dependență necesară nu este instalată."
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Dependență necesară „%s” nu este instalată. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Se verifică managerul de pachete"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Pregătirea înnoirii a eșuat"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -682,7 +682,7 @@
"Pregătirea sistemului în vederea actualizării a eșuat, astfel că se pornește "
"un proces pentru raportarea defecțiunilor."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -691,12 +691,12 @@
"de programare instalați apport, după care executați comanda 'apport-bug "
"ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Obținerea cerințelor pentru înnoire a eșuat"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -708,7 +708,7 @@
"\n"
"În plus, a fost inițiat un raport pentru defecte de programare."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -723,23 +723,23 @@
"Pentru a raporta un defect de programare instalați apport, după care "
"executați comanda 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Se actualizează informațiile despre depozite"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Nu s-a putut adăuga CDROM-ul"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Nu s-a putut adăuga CDROM-ul"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informații despre pachete nevalide"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -758,41 +758,41 @@
"În cazul unei surse încărcate de trafic, ați putea încerca să actualizați "
"mai târziu."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Se descarcă"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Se înnoiește"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Înnoire finalizată"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Înnoirea s-a terminat, dar au existat erori în timpul procesului de înnoire."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Se caută aplicații învechite"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Înnoirea sistemului este completă."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Înnoirea parțială a fost încheiată."
@@ -821,17 +821,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "'%(file)s' fișiere autentificate prin '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "se extrage '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nu s-a putut executa programul de înnoire"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -839,27 +839,27 @@
"Cel mai probabil există o eroare în pachetul de actualizare. Raportați "
"această eroare folosind comanda 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Înnoiește semnătura utilitarului"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Program de înnoire"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Descărcare eșuată"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Descărcarea înnoirii a eșuat. Ar putea exista o problemă la rețea. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autentificare eșuată"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -867,11 +867,11 @@
"Autentificarea înnoirii a eșuat. Ar putea exista o problemă cu rețeaua sau "
"cu serverul. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Nu s-a putut extrage"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -879,11 +879,11 @@
"Extragerea înnoirii a eșuat. Ar putea exista o problemă cu rețeaua sau cu "
"serverul. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verificarea a eșuat"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -891,12 +891,12 @@
"Verificarea înnoirii a eșuat. S-ar putea să fie o problemă cu rețeaua sau cu "
"serverul. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nu s-a putut executa înnoirea"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -904,7 +904,7 @@
"Apare de regulă pe sisteme în care /tmp este montat noexec. Remontați fără "
"opțiunea noexec și rulați din nou actualizarea."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Mesajul de eroare este „%s”."
@@ -1020,11 +1020,11 @@
"\n"
"Doriți să continuați?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Niciun CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1036,11 +1036,11 @@
"arhitectură minimă. Nu este posibilă actualizarea sistemului dumneavoastră "
"la o nouă versiune Ubuntu cu acest hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Nu există nici un procesor ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1052,11 +1052,11 @@
"optimizări care necesită ARMv6, ca arhitectură minimă. Cu acest hardware, nu "
"se poate înnoi sistemul la noua versiune Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nu există niciun serviciu „init” disponibil"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1072,11 +1072,11 @@
"\n"
"Sigur doriți să continuați?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nu este activat"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1825,13 +1825,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Se descarcă utilitarul de înnoire"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Verifică dacă este posibilă înnoirea la cea mai recentă versiune în "
"dezvoltare"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1910,20 +1910,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Executați „do-release-upgrade” pentru a o aplica."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Actualizare de programe"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Înnoire disponibilă pentru Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ați refuzat înnoirea la Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Adaugă informații pentru depanare"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ru.po ubuntu-release-upgrader-17.10.1/po/ru.po
--- ubuntu-release-upgrader-17.04.7/po/ru.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ru.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ru\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Сервер для %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Основной сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Пользовательские серверы"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Не удалось рассчитать элемент sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Не удалось найти файлы пакетов, может быть, это не диск дистрибутива Ubuntu "
"или неверная архитектура?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Не удалось добавить компакт-диск"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,14 +70,14 @@
"Сообщение об ошибке:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Удалить пакет с ошибками."
msgstr[1] "Удалить пакеты с ошибками."
msgstr[2] "Удалить пакеты с ошибками."
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -102,15 +102,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Возможно, сервер перегружен"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Повреждённые пакеты"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -120,7 +120,7 @@
"прежде чем продолжить."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -138,11 +138,11 @@
" * Неофициальное ПО, не предоставляемое Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Вероятно, это временная проблема. Попробуйте повторить позднее."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -150,15 +150,15 @@
"Если ничего из перечисленного не подходит, сообщите об этой ошибке, выполнив "
"команду «ubuntu-bug ubuntu-release-upgrader-core» в терминале."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Не удалось рассчитать обновление системы"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Ошибка при проверке подлинности некоторых пакетов"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -168,7 +168,7 @@
"кратковременная проблема с сетью и стоит повторить операцию позже. Ниже "
"приведен список пакетов, не прошедших проверку."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -176,22 +176,22 @@
"Пакет «%s» отмечен для удаления, но он находится в списке запрещённых к "
"удалению."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Основной пакет «%s» отмечен для удаления."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Попытка установки внесённой в чёрный список версии «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Не удалось установить «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -199,11 +199,11 @@
"Невозможно установить требуемый пакет. Сообщите об этой ошибке, выполнив "
"команду «ubuntu-bug ubuntu-release-upgrader-core» в терминале."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Не удалось подобрать мета-пакет"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -531,7 +531,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Вычисление изменений"
@@ -553,7 +553,7 @@
"состояния системы. Вы можете продолжить это обновление позже."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Не удалось загрузить обновления"
@@ -568,27 +568,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Ошибка при фиксировании"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Восстановление первоначального состояния системы"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Не удалось установить обновления"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -597,7 +597,7 @@
"использования состоянии. Сейчас будет запущен процесс восстановления (dpkg --"
"configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -614,7 +614,7 @@
"прикрепив файлы из папки «/var/log/dist-upgrade/» к отчёту.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -622,20 +622,20 @@
"Обновление было отменено. Проверьте ваше соединение с интернетом или ваш "
"установочный носитель и попробуйте снова. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Удалить устаревшие пакеты?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Оставить"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Удалить"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -644,28 +644,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Не установлены требуемые зависимости"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Требуемая зависимость «%s» не установлена. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Проверка менеджера пакетов"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Подготовка к обновлению завершилась неудачно"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -673,7 +673,7 @@
"Подготовки системы к обновлению не удалась, будет запущена программа отчетов "
"об ошибках."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -681,12 +681,12 @@
"Подготовка системы к обновлению закончилась сбоем. Чтобы сообщить об ошибке, "
"установите apport и выполните команду 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Подготовка к обновлению завершилась неудачно"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -699,7 +699,7 @@
"\n"
"Выполняется запуск системы сообщения о неполадке."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -710,23 +710,23 @@
"Не выполнены системные требования для выполнения обновления. Процедура "
"обновления будет отменена, исходное состояние системы будет восстановлено."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Обновление информации о репозитории"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Добавление компакт-диска завершилось неудачно"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Добавление компакт-диска завершилось неудачно."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Неверная информация о пакете"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -744,41 +744,41 @@
"В случае превышения нагрузки зеркала вы можете повторить попытку обновления "
"позже."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Загрузка"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Обновление"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Обновление завершено"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Обновление завершено, но во время процесса обновления произошли ошибки."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Поиск устаревших программ"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Обновление системы завершено."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Частичное обновление завершено."
@@ -807,17 +807,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "аутентифицировать '%(file)s' вместо '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "извлечение '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Не удалось запустить утилиту обновления"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -825,27 +825,27 @@
"Скорее всего, это ошибка в программе обновления. Пожалуйста, сообщите о ней, "
"выполнив команду «ubuntu-bug ubuntu-release-upgrader-core» в терминале."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Подпись утилиты обновления"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Утилита обновления"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Не удалось получить"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Не удалось получить обновление. Возможно, возникла проблема в сети. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Проверка подлинности не удалась"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -853,11 +853,11 @@
"Проверка подлинности обновления не удалась. Возможно, возникла проблема в "
"сети или на сервере. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Не удалось извлечь"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -865,11 +865,11 @@
"Не удалось извлечь обновление. Возможно, возникла проблема в сети или на "
"сервере. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Проверка не удалась"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -877,12 +877,12 @@
"Проверка обновления завершилась неудачно. Возможно, возникла проблема в сети "
"или на сервере. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Не удалось запустить процесс обновления"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -890,7 +890,7 @@
"Обычно возникает в системе, где /tmp смонтирован с флагом noexec. "
"Пожалуйста, перемонтируйте без флага noexec и запустите обновление снова."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Сообщение об ошибке «%s»."
@@ -1002,11 +1002,11 @@
"\n"
"Вы хотите продолжить?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Нет i686-совместимого процессора"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1018,11 +1018,11 @@
"архитектуру i686 и выше. Обновить вашу систему до новой версии Ubuntu на "
"этом компьютере не получится."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Нет процессора ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1034,11 +1034,11 @@
"выше. Вашу систему невозможно обновить до нового релиза Ubuntu с текущим "
"аппаратным обеспечением."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Служба init недоступна"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1054,11 +1054,11 @@
"\n"
"Вы уверены, что хотите продолжить?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE отключен"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1801,12 +1801,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Загрузка программы для обновления дистрибутива"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Проверка возможности обновления до последней нестабильной версии дистрибутива"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1884,20 +1884,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Чтобы обновиться до него, выполните «do-release-upgrade»."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Обновление приложений"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Доступно обновление Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Вы отклонили обновление до Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Добавить результаты отладки"
diff -Nru ubuntu-release-upgrader-17.04.7/po/rw.po ubuntu-release-upgrader-17.10.1/po/rw.po
--- ubuntu-release-upgrader-17.04.7/po/rw.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/rw.po 2017-04-24 21:05:20.000000000 +0000
@@ -23,12 +23,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:49+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: rw\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -36,30 +36,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -90,22 +90,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -116,63 +116,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -423,7 +423,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -443,7 +443,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -455,33 +455,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -492,26 +492,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -519,45 +519,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -565,7 +565,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -574,23 +574,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -602,40 +602,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -664,80 +664,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -831,11 +831,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -843,11 +843,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -855,11 +855,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -869,11 +869,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1548,11 +1548,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1620,19 +1620,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/sco.po ubuntu-release-upgrader-17.10.1/po/sco.po
--- ubuntu-release-upgrader-17.04.7/po/sco.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sco.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Main server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Couldna calculate sources.list entry"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Unable tae find ony package files, perhaps this isnae a Ubuntu Disc or the "
"wrang architecture?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Failed tae add the CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,12 +68,12 @@
"The error message wus:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Remove package in bad state"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -92,15 +92,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "The server mey be overloaded"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Browkn Packages"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -109,7 +109,7 @@
"Please fix 'em first using synaptic or apt-get afore gan on."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -120,25 +120,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "This is mæ'st likely tae be a transient problem, try it again later."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Couldnae calculate the upgrade"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error authenticatin some o the packages"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -148,39 +148,39 @@
"transient network problem. Ye might want tae try it again later. See below "
"fur a list o unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"The packæ'ge '%s' is marked fur removal but it's in the removal blacklist."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -434,7 +434,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -454,7 +454,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -466,33 +466,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -503,26 +503,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -530,45 +530,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -576,7 +576,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -585,23 +585,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -613,40 +613,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -675,80 +675,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -842,11 +842,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -854,11 +854,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -866,11 +866,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -880,11 +880,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1559,11 +1559,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1631,20 +1631,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/sc.po ubuntu-release-upgrader-17.10.1/po/sc.po
--- ubuntu-release-upgrader-17.04.7/po/sc.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sc.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: sc\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server pro %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Server printzipale"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Server personalitzados"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Impossibile agatare files de pachetes. Forsis custu no est unu discu de "
"Ubuntu, o est pro una architetura diferente."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Annanta de su CD no arrenèschida."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -84,22 +84,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -110,63 +110,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -417,7 +417,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -437,7 +437,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -449,33 +449,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -486,26 +486,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -513,45 +513,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -559,7 +559,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -568,23 +568,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -596,40 +596,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -658,80 +658,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -825,11 +825,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -837,11 +837,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -849,11 +849,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -863,11 +863,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1542,11 +1542,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1614,19 +1614,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/sd.po ubuntu-release-upgrader-17.10.1/po/sd.po
--- ubuntu-release-upgrader-17.04.7/po/sd.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sd.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: sd\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "سي ڊي شامل ڪرڻ ۾ ناڪامي"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "ٽٽل بنڊل"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "تجديد ماپي نه سگهيو"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "’%s‘ تنسيب نه ٿو ٿي سگهي"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/se.po ubuntu-release-upgrader-17.10.1/po/se.po
--- ubuntu-release-upgrader-17.04.7/po/se.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/se.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: se\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Doalat"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Váldde eret"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Viežžan"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Ođasmahttimiid"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Ođasmahttimiid válmmas"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "veažžamin '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autentiseren filtii"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/shn.po ubuntu-release-upgrader-17.10.1/po/shn.po
--- ubuntu-release-upgrader-17.04.7/po/shn.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/shn.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: shn\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/si.po ubuntu-release-upgrader-17.10.1/po/si.po
--- ubuntu-release-upgrader-17.04.7/po/si.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/si.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s සඳහා සර්වරය"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ප්රධාන සර්වරය"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "ව්යවහාර සර්වරයන්"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list ඇතුලු කිරීම ගණනය කළනොහැක."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"කර ඇත්තේ උබුන්ටු වල සංගත තැටිය නොවන්නට ඇති එසේ නොමැති නම් මේ මෘදුකාංගය ඔබේ "
"පරිගණක පද්ධතියට නොගැලපෙන එකක් විය හැක."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "සුසංහිත තැටිය එක් කිරීම අසාර්ථක වුණි"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -64,13 +64,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "අයහපත් තත්වයේ තිබෙන පැකේජය ඉවත් කරන්න"
msgstr[1] "අයහපත් තත්වයේ තිබෙන පැකේජයන් ඉවත් කරන්න"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -85,22 +85,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "සමහරවිට සර්වරය අතිබැර වී ඇත"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "බිදුණු පැකේජ"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -111,63 +111,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "උසස් කෙරුම ගණනය කල නොහැක"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ස්ථාපනය කල නොහැක"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -418,7 +418,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "වෙනස්කම් ගණනය කරමින්"
@@ -438,7 +438,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "උසස් කිරීම් බාගැනීමට නොහැකි විය"
@@ -450,33 +450,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "උසස් කිරීම් ස්ථාපනය කිරීමට නොහැකි විය"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -487,26 +487,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_තබාගන්න"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "ඉවත් කරන්න"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -514,45 +514,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -560,7 +560,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -569,23 +569,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "කෝෂ්ඨාගාරයේ තොරතුරු යාවත්කාලීන කරමින්"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "වලංගු නොවන පැකේජ තොරතුරු"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -597,40 +597,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "පමුණුවමින්"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "උසස් කරමින්"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "උසස් කිරීම සම්පූර්ණයි"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "පද්ධතියේ උසස් කිරීම සම්පූර්ණයි."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -659,80 +659,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' උපුටමින්"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "උසස් කිරීම් මෙවලම"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "සත්යවත් කිරීම අසාර්ථකයි"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -826,11 +826,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -838,11 +838,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -850,11 +850,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -864,11 +864,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1543,11 +1543,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1615,19 +1615,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/sk.po ubuntu-release-upgrader-17.10.1/po/sk.po
--- ubuntu-release-upgrader-17.04.7/po/sk.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sk.po 2017-04-24 21:05:20.000000000 +0000
@@ -19,12 +19,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server pre %s"
@@ -32,20 +32,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Hlavný server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Vlastné servery"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nemožno vypočítať položku v sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -53,11 +53,11 @@
"Nemožno lokalizovať žiadne balíčky súborov. Pravdepodobne toto nie je CD/DVD "
"Ubuntu alebo je určené pre inú architektúru."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Zlyhalo pridanie CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -72,14 +72,14 @@
"Chybová správa bola:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Odstrániť balíky v zlom stave"
msgstr[1] "Odstrániť balík v zlom stave"
msgstr[2] "Odstrániť balíky v zlom stave"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -104,15 +104,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Server môže byť preťažený"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -121,7 +121,7 @@
"opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -140,11 +140,11 @@
"* používate neoficiálne balíky softvéru, ktoré neposkytuje tím Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Toto je pravdepodobne dočasný problém, prosím skúste to neskôr."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -152,15 +152,15 @@
"Ak nič z uvedeného nie je relevantné, prosím, nahláste túto chybu spustením "
"príkazu „ubuntu-bug ubuntu-release-upgrader-core“ v termináli."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nepodarilo sa vypočítať aktualizáciu"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Chyba pri overovaní niektorých balíkov"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -170,7 +170,7 @@
"sieťou. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam neoverených "
"balíkov."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -178,22 +178,22 @@
"Balík „%s“ je označený na odstránenie ale nachádza sa na zozname balíkov, "
"ktoré sa nemajú odstraňovať."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Nevyhnutný balík „%s“ je označený na odstránenie."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Pokus o nainštalovanie verzie „%s“ z čiernej listiny"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Nie je možné nainštalovať „%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -201,11 +201,11 @@
"Nebolo možné nainštalovať povinný balík. Prosím, nahláste túto chybu "
"spustením príkazu „ubuntu-bug ubuntu-release-upgrader-core“ v termináli."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Nie je možné odhadnúť meta-balík"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -537,7 +537,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Počítajú sa zmeny"
@@ -559,7 +559,7 @@
"aktualizácii môžete neskôr pokračovať."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nebolo možné stiahnuť aktualizácie"
@@ -574,27 +574,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Chyba počas potvrdzovania"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Obnovuje sa pôvodný stav systému"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nebolo možné nainštalovať aktualizácie"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -602,7 +602,7 @@
"Aktualizácia bola prerušená. Váš systém sa môže nachádzať v nepoužiteľnom "
"stave. Teraz sa spustí pokus o obnovenie (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -619,7 +619,7 @@
"pripojte k hláseniu chyby súbory z adresára /var/log/dist-upgrade/.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -627,20 +627,20 @@
"Aktualizácia bola prerušená. Prosím, skontrolujte svoje pripojenie k "
"internetu alebo inštalačné médium a skúste to znova. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Odstrániť zastarané balíky?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Ponechať"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Odstrániť"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -650,28 +650,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Požadované závislosti nie sú nainštalované"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Požadovaná závislosť '%s' nie je nainštalovaná. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kontroluje sa správca balíkov"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Príprava prechodu na vyššiu verziu zlyhala"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -679,7 +679,7 @@
"Príprava systému na aktualizáciu zlyhala, preto sa spúšťa proces hlásenia "
"chyby ."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -688,12 +688,12 @@
"nainštalovaním aplikácie apport a následným spustením „apport-bug ubuntu-"
"release-upgrader“."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Zisťovanie predpokladov aktualizácie zlyhalo"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,7 +705,7 @@
"\n"
"Okrem toho sa spúšťa proces hlásenia chyby ."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -719,23 +719,23 @@
"Chybu môžete nahlásiť nainštalovaním aplikácie apport a následným spustením "
"„apport-bug ubuntu-release-upgrader“."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Aktualizujú sa informácie o zdrojoch softvéru"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Nepodarilo sa pridať CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Ľutujeme, pridanie CD-ROM neprebehlo úspešne"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Neplatná informácia o balíku"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -747,40 +747,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Sťahuje sa"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Prebieha prechod na novšiu verziu"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Aktualizácia dokončená"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Aktualizácia bola dokončená, ale počas nej sa vyskytli chyby."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Vyhľadávanie zastaraného softvéru"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Aktualizácia systému je dokončená."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Čiastočná aktualizácia je dokončená."
@@ -809,17 +809,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "overenie „%(file)s“ voči „%(signature)s“ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extrahuje sa „%s“"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nebolo možné spustiť aktualizačný program"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -828,28 +828,28 @@
"túto chybu spustením príkazu „ubuntu-bug ubuntu-release-upgrader-core“ v "
"termináli."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Podpis aktualizačného programu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Aktualizačný nástroj"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Zlyhalo získavanie"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Zlyhalo získavanie aktualizácie. Môže to byť spôsobené sieťovým problémom. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Overenie totožnosti zlyhalo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -857,11 +857,11 @@
"Zlyhalo overenie pravosti aktualizácie. Môže to byť spôsobené sieťovým "
"problémom alebo nedostupnosťou servera. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Chyba pri rozbaľovaní"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -869,11 +869,11 @@
"Nebolo možné rozbaliť aktualizáciu. Môže to byť spôsobené sieťovým problémom "
"alebo nedostupnosťou servera. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Overenie zlyhalo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -881,12 +881,12 @@
"Zlyhalo overenie aktualizácie. Mohol to spôsobiť problém siete alebo "
"servera. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nie je možné spustiť aktualizáciu systému"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -894,7 +894,7 @@
"To zvyčajne spôsobuje systém, kde je /tmp pripojený s príznakom noexec. "
"Prosím, znova ho pripojte bez príznaku noexec a znova spustite aktualizáciu."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Chybová správa je '%s'."
@@ -1005,11 +1005,11 @@
"\n"
"Chcete pokračovať?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "CPU nie je i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1020,11 +1020,11 @@
"vytvorené a optimalizované pre procesory i686 alebo vyššie. Nie je možné "
"nainštalovať nové vydanie Ubuntu na tento hardvér."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Neobsahuje procesor ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1036,11 +1036,11 @@
"architektúru ARMv6 alebo lepšiu. Na tomto hardvéri nie je možné aktualizovať "
"váš systém na nové vydanie Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nie je dostupný žiaden init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1055,11 +1055,11 @@
"\n"
"Ste si istý, že chcete pokračovať?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nie je zapnuté"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1803,12 +1803,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Sťahuje sa nástroj na prechod na vyššiu verziu distribúcie."
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Skontrolovať, či je možné aktualizovať na najnovšiu vývojársku verziu"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1887,20 +1887,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Ak naň chcete aktualizovať systém, spustite „do-release-upgrade“."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Aktualizácia softvéru"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Dostupná nová verzia Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Odmietli ste aktualizovať na Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Pridať ladiaci výstup"
diff -Nru ubuntu-release-upgrader-17.04.7/po/sl.po ubuntu-release-upgrader-17.10.1/po/sl.po
--- ubuntu-release-upgrader-17.04.7/po/sl.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sl.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,15 +16,15 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"X-Poedit-Country: SLOVENIA\n"
"Language: sl\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: utf-8\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Strežnik za %s"
@@ -32,20 +32,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Glavni strežnik"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Strežniki po meri"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Ni mogoče izračunati vnosa v sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -53,11 +53,11 @@
"Ni mogoče najti nobenih datotek s programskimi paketi. Morda vstavljen disk "
"ni Ubuntujev ali pa ni namenjen arhitekturi vašega računalnika."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Nosilca CD ni mogoče dodati"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -73,7 +73,7 @@
"Sporočilo o napaki:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Odstrani pakete v slabem stanju"
@@ -81,7 +81,7 @@
msgstr[2] "Odstrani paketa v slabem stanju"
msgstr[3] "Odstrani pakete v slabem stanju"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -108,15 +108,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Strežnik je najverjetneje preobremenjen"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Okvarjeni paketi"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -126,7 +126,7 @@
"orodjem apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -144,11 +144,11 @@
" * Neuradni programski paketi, ki jih Ubuntu ne zagotavlja\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Napaka je verjetno le začasna, zato poskusite znova kasneje."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -156,15 +156,15 @@
"Če nič od tega ne velja, potem pošljite poročilo o napaki z uporabo ukaz "
"'ubuntu-bug ubuntu-release-upgrader-core' v terminalu."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Ni mogoče preračunati zahtev nadgradnje"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Napaka overjanja pristnosti nekaterih paketov"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -173,30 +173,30 @@
"Nekaterih paketov ni mogoče overiti. Napaka je lahko prehodne narave, zato "
"poskusite ponovno kasneje. Spodaj je izpisan seznam neoverjenih paketov."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Paket '%s' je označen za odstranitev, vendar je na črnem seznamu paketov."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
"Paket '%s', ki je pomemben za delovanje sistema, je označen za odstranitev."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Namešča se različica '%s', ki je na črnem seznamu"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Ni mogoče namestiti '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -204,11 +204,11 @@
"Ni bilo mogoče namestiti željenega paketa. Sporočite to kot hrošč z uporabo "
"ukaza 'ubuntu-bug ubuntu-release-upgrader-core' v terminalu."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Ni mogoče določiti metapaketa"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -542,7 +542,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Preračunavanje sprememb"
@@ -564,7 +564,7 @@
"Nadgradnjo lahko nadaljujete kasneje."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Paketov za nadgradnjo ni mogoče prejeti"
@@ -579,27 +579,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Napaka med uveljavitvijo"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Obnavljanje prvotnega stanja sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Ni mogoče namestiti nadgrajenih različic"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -607,7 +607,7 @@
"Nadgradnja je bila prekinjena. Vaš sistem je lahko v neuporabnem stanju. "
"Sedaj se bo zagnala obnovitev sistema (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -624,7 +624,7 @@
"k poročilu o napaki priložite datoteke v /var/log/dist-upgrade/.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -632,20 +632,20 @@
"Nadgranja je bila prekinjena. Preverite svojo omrežno povezavo ali "
"namestitveni medij in poskusite znova. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ali naj bodo zastareli paketi odstranjeni?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "Ob_drži"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Od_strani"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -655,28 +655,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Zahtevani odvisni paketi niso nameščeni"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Zahtevan odvisni paket '%s' ni nameščen. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Preverjanje upravljalnika paketov"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Priprava nadgradnje ni bila uspešna"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -684,7 +684,7 @@
"Pripravljanje sistema na nadgradnjo je spodletelo, zato se začenja opravilo "
"poročanja hrošča."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -692,12 +692,12 @@
"Priprava sistema na nadgradnjo je spodletela. Za poročanje hrošča namestite "
"apport in nato izvedite 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Pridobivanje predpogojev za nadgradnjo je spodletelo"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -709,7 +709,7 @@
"\n"
"Poleg tega se začenja opravilo poročanja hrošča."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -723,23 +723,23 @@
"Za poročanje hrošča namestite apport in nato izvedite 'apport-bug ubuntu-"
"release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Posodabljanje podatkov o skladiščih"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Dodajanje nosilca cdrom je spodletelo"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Dodajanje nosilca cdrom je spodletelo."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Neveljani podatki o paketu"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -759,41 +759,41 @@
"V primeru preobremenjenega zrcalnega strežnika ponovno poskusite z "
"nadgradnjo pozneje."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Pridobivanje"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Nadgrajevanje"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Nadgradnja je končana"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Nadgradnja se je končala, vendar je med opravilom nadgradnje prišlo do napak."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Iskanje zastarelih programov"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Nadgradnja sistema je zaključena."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Delna nadgradnja je končana."
@@ -822,17 +822,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "overi '%(file)s' z '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "razširjanje '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Orodja za nadgradnjo ni bilo mogoče zagnati"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -840,29 +840,29 @@
"To je najverjetneje hrošč v orodju za nadgradnjo. Pošljite poročilo o napaki "
"z uporabo ukaza 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Podpis orodja za nadgradnjo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Orodje za nadgradnjo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Pridobivanje paketov je spodletelo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Pridobivanje paketov nadgradnje je spodletelo. Morda je napaka v omrežni "
"povezavi. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Overitev je spodletela"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -870,11 +870,11 @@
"Overitev nadgradnje je spodletela. Morda je prišlo do napake omrežja ali "
"strežnika. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Razširjanje paketov je spodletelo"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -882,11 +882,11 @@
"Razširjanje paketov nadgradnje je spodletelo. Morda je prišlo do napake "
"omrežja ali strežnika. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Overitev je spodletela"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -894,12 +894,12 @@
"Preverjanje nadgradnje je spodletelo. Morda je prišlo do napake omrežja ali "
"strežnika. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nadgradnje ni mogoče zagnati"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -908,7 +908,7 @@
"noexec. Ponovno priklopite nosilec brez zastavice noexec in ponovno zaženite "
"nadgradnjo."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Sporočilo o napaki je '%s'."
@@ -1019,11 +1019,11 @@
"\n"
"Ali želite nadaljevati?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Brez CPE i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1035,11 +1035,11 @@
"i686. S to strojno opremo vašega sistema ni mogoče nadgraditi na novo izdajo "
"Ubuntuja."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ni CPE ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1051,11 +1051,11 @@
"različico arhitekture. Na trenutni strojni opremi ni mogoče nadgraditi "
"vašega sistema na novo izdajo distribucije Ubuntu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Init ni na voljo"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1070,11 +1070,11 @@
"\n"
"Ali res želite nadaljevati?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE ni omogočen"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1830,12 +1830,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Prejemanje orodja za nadgradnjo izdaje"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Preveri, ali je mogoče sistem nadgraditi na najnovejšo razvojno različico"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1914,20 +1914,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Za nadgradnjo na novo izdajo zaženite ukaz 'do-release-upgrade'."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Posodobilnik programske opreme"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Na voljo je nadgradnja na Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Zavrnili ste nadgradnjo na Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Dodaj izhod razhroščevanja"
diff -Nru ubuntu-release-upgrader-17.04.7/po/sq.po ubuntu-release-upgrader-17.10.1/po/sq.po
--- ubuntu-release-upgrader-17.04.7/po/sq.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sq.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,13 +15,13 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:48+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:26+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: sq\n"
"X-Poedit-Bookmarks: 126,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Serveri për %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Serveri Kryesor"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Servera të personalizuar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Nuk mundëm të llogarisim hyrjen sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"I pamundur lokalizimi i skedarëve të paketave, ndoshta ky nuk është një disk "
"i Ubuntu ose është në arkitekturë e gabuar?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Futja e CD dështoi"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,13 +69,13 @@
"Mesazhi i gabimit ishte:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Fshije paketën në gjendje të keqe"
msgstr[1] "Fshiji paketat në gjendje të keqe"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -96,15 +96,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Serveri mund të jetë i mbingarkuar"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Paketat e dëmtuara"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -114,7 +114,7 @@
"përpara."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -132,13 +132,13 @@
" * Paketa programesh jo zyrtare që nuk jepen nga Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Ky ka mundësi të jetë një problem kalimtar, ju lutemi provojeni përsëri më "
"vonë."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -147,15 +147,15 @@
"duke përdorur komandën 'ubuntu-bug ubuntu-release-upgrader-core' në një "
"terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Nuk mundëm të llogarisim përditësimin"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Gabim gjatë vërtetimit të origjinalitetit të disa paketave."
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -165,29 +165,29 @@
"problemet me rrjetin.Ju lutemi provoni më vonë edhe një herë.Paketat e "
"mëposhtme nuk mund të vërtetohen për nga origjinaliteti."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Paketa '%s' është shënuar për tu hequr, por është në listën e zezë të heqjes."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Paketa thelbësore '%s' është shënuar për tu hequr."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Duke u përpjekur të istaloj versionin e listës së zezë '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' nuk mund të instalohet"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -196,11 +196,11 @@
"këtë si një gabim duke përdorur 'ubuntu-bug ubuntu-release-upgrader-core' në "
"një terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Can't guess meta-package"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -527,7 +527,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Duke llogaritur ndryshimet"
@@ -549,7 +549,7 @@
"sistemit. Ju mund ta rinisni përditësimin më vonë."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Nuk mund të aktualizohen, shkarkimet"
@@ -564,27 +564,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Gabim gjatë vendosjes"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Duke kthyer gjendjen origjinale të sistemit"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Nuk mund të instalohen, aktualizimet"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -592,7 +592,7 @@
"Përditësimi u anullua. Sistemi juaj mund të jetë në një gjendje të "
"paqëndrueshme. Tani do të nisë rekuperimi (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -610,7 +610,7 @@
"gabimit.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -618,20 +618,20 @@
"Përditësimi u anullua. Ju lutemi të kontrolloni lidhjen tuaj me internetin "
"apo median e instalimit dhe të provoni përsëri. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ti heqim paketat e vjetra?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Mbaj"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Hiqe"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -641,28 +641,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Vartësitë e kërkuara nuk janë instaluar"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Vartësia e kërkuar '%s' nuk është instaluar. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Duke kontrolluar menaxhuesin e paketave"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Përgatitja e përditësimit dështoi"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -670,7 +670,7 @@
"Përgatitja e sistemit për përditësim dështoi ndaj një proçes i raportimit të "
"gabimit po niset."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -678,12 +678,12 @@
"Përgatitja e sistemit për përditësim dështoi. Për të raportuar një defekt "
"instalo apport dhe pastaj ekzekuto 'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Marrja e kërkesave të përditësimit dështoi"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -696,7 +696,7 @@
"\n"
"Gjithashtu, një proçes i raportimit të gabimit do të niset."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -704,24 +704,30 @@
"To report a bug install apport and then execute 'apport-bug ubuntu-release-"
"upgrader'."
msgstr ""
+"Sistemi nuk është në gjendje të gjejë parametrat e duhur për tu pëditësuar. "
+"Përditësimi do të anullohet dhe do të rikthehet gjendja origjinale e "
+"sistemit.\n"
+"\n"
+"Për të raportuar një mosfunksionim instalo apport dhe pastaj ekzekuto "
+"'apport-bug ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Duke përditësuar informacionin e magazinës"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Dështova në shtimin e cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Më vjen keq, shtimi i cdrom nuk qe i suksesshëm."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Informacion i pavlefshëm i paketave"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -733,41 +739,41 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Duke mbledhur"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Aktualizo"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Aktualizimi përfundoi"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Përditësimi u kompletua por pati gabime gjatë proçesit të përditësimit."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Duke kërkuar për programe të vjetra"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Aktualizimi i sistemit është komplet"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Përditësimi i pjesshëm nuk u kompletua."
@@ -796,17 +802,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "identifiko '%(file)s' kundrejt '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "duke ekstraktuar '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Nuk mund ta nisim mjetin e përditësimit"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -815,27 +821,27 @@
"raportoni si një gabim duke përdorur komandën 'ubuntu-bug ubuntu-release-"
"upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Përditësoni firmën e mjeteve"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Mjeti përditësues"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Dështuam në marrje"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Marrja e përditësimit dështoi. Mund të jetë një problem rrjeti. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Identifikimi dështoi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -843,11 +849,11 @@
"Identifikimi i përditësimit dështoi. Mund të ketë një problem me rrjetin ose "
"me serverin. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Dështuam në nxjerrje"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -855,11 +861,11 @@
"Nxjerrja e përditësimit dështoi. Mund të ketë një problem me rrjetin apo me "
"serverin. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifikimi dështoi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -867,12 +873,12 @@
"Verifikimi i përditësimit dështoi. Mund të ketë një problem me rrjetin apo "
"me serverin. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Nuk mund të nisim përditësimin"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -880,7 +886,7 @@
"Kjo zakonisht shkaktohet nga një sistem ku /tmp montohet noexec. Ju lutemi "
"ta rimontoni pa noexec dhe nisni përditësimin përsëri."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Mesazhi i gabimit është '%s'."
@@ -993,11 +999,11 @@
"\n"
"Dëshironi të vazhdoni?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Jo i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1009,11 +1015,11 @@
"arkitekturë minimale. Nuk është e mundur ta përditësoni sistemin tuaj në një "
"version të ri të Ubuntu me këtë hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Jo ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1025,11 +1031,11 @@
"ARMv6 si arkitekturë minimale. Nuk është e mundur ta përditësoni sistemin "
"tuaj në një version të ri të Ubuntu me këtë hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Nuk ka init të disponueshëm"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1045,17 +1051,22 @@
"\n"
"Jeni i sigurtë që dëshironi të vazhdoni?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE nuk është aktivizuar"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
"you must enable PAE (if this is possible) see:\n"
"http://help.ubuntu.com/community/EnablingPAE"
msgstr ""
+"Sistemi yt përdor një CPU që nuk e ka PAE të aktivizuar. Ubuntu i suporton "
+"sistemet jo-PAE deri tek Ubuntu 12.04. Për të kaluar në një version të "
+"mëvonshëm të Ubuntu, ju duhet të aktivizoni PAE (nëse është e mundur) "
+"shikoni:\n"
+"http://help.ubuntu.com/community/EnablingPAE"
#: ../DistUpgrade/DistUpgradeMain.py:59
msgid "Sandbox upgrade using aufs"
@@ -1779,12 +1790,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Duke shkarkuar mjetin për përditësimin e versionit"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Kontrollo nëse përditësimi në versionin e fundit dlevel është i disponueshëm"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1864,20 +1875,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Nis 'do-release-upgrade' për të përditësuar atë."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Përditësuesi i Programeve"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(versioni)s Përditësim i Disponueshëm"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ju e keni mohuar përditësimin tek ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Shto daljen e kontrollit të gabimeve"
diff -Nru ubuntu-release-upgrader-17.04.7/po/sr.po ubuntu-release-upgrader-17.10.1/po/sr.po
--- ubuntu-release-upgrader-17.04.7/po/sr.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sr.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: sr\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Земља сервера %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Главни сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Ручно подешени сервери"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Не могу да урачунам ставку „sources.list“ (списак извора)"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"Не могу да пронађем ниједну датотеку пакета, можда ово није Убунту диск или "
"је погрешна архитектура?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Нисам успео да додам ЦД диск"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,14 +70,14 @@
"Грешка беше:\n"
"„%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Уклони пакет у лошем стању"
msgstr[1] "Уклони пакете у лошем стању"
msgstr[2] "Уклони пакете у лошем стању"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -102,15 +102,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Сервер је можда преоптерећен"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Оштећени пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -120,7 +120,7 @@
"наставите."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -138,11 +138,11 @@
" * Употребом незваничних пакета софтвера\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Ово је највероватније пролазни проблем, касније покушајте поново."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -151,15 +151,15 @@
"грешци користећи наредбу „ubuntu-bug ubuntu-release-upgrader-core“ у "
"терминалу."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Не могу да испланирам надоградњу"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Грешка приликом провере веродостојности неких пакета"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -169,7 +169,7 @@
"пролазни мрежни проблем, те уколико желите, можете пробати још једном "
"касније. Испод се налази списак пакета који нису проверени."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -177,22 +177,22 @@
"Пакет „%s“ је означен за уклањање али се налази на списку пакета који не "
"треба да се уклањају."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Кључни пакет „%s“ је означен за уклањање."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Покушавам да инсталирам издање „%s“ са списка забрана"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Не могу да инсталирам „%s“"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -200,11 +200,11 @@
"Није могуће инсталирати жељени пакет. Поднесите извештај о грешци користећи "
"наредбу „ubuntu-bug ubuntu-release-upgrader-core“ у терминалу."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Не могу да погодим мета пакет"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -532,7 +532,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Срачунавам измене"
@@ -554,7 +554,7 @@
"Можете да наставите надоградњу касније."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Нисам могао да преузмем надоградње"
@@ -568,27 +568,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Грешка приликом слања"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Враћам оригинално стање система"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Нисам могао да инсталирам надоградње"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -596,7 +596,7 @@
"Надоградња је прекинута. Ваш систем би могао бити у неупотребљивом стању. "
"Сада ће почети процес опоравка (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -614,7 +614,7 @@
"„/var/log/dist-upgrade/“.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -622,20 +622,20 @@
"Надоградња је прекинута. Проверите вашу Интернет везу или инсталациони "
"медијум и покушајте поново. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Да уклоним застареле пакете?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Задржи"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Уклони"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -645,28 +645,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Неопходна зависност није инсталирана"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Неопходна зависност „%s“ није инсталирана. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Проверавам управника пакета"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Припрема надоградње није успела"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -674,7 +674,7 @@
"Припрема система за надоградњу није успела тако да је покренут процес за "
"извештавање о грешци."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -683,12 +683,12 @@
"инсталирајте „apport“ и затим извршите наредбу „apport-bug ubuntu-release-"
"upgrader“."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Набављање предуслова надоградње није успело"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -700,7 +700,7 @@
"\n"
"Уз ово, покренут је и процес за извештавање о грешци."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -714,23 +714,23 @@
"Да известите о грешци, инсталирајте „apport“ и затим извршите наредбу "
"„apport-bug ubuntu-release-upgrader“."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ажурирам информације ризница"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Нисам успео да додам ЦД-РОМ"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Извините, додавање ЦД-РОМа није било успешно."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Неисправне информације пакета"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -749,41 +749,41 @@
"Уколико је проблем превелико оптерећење на серверу, покушајте надоградњу "
"мало касније."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Добављам"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Надограђујем"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Надоградња је завршена"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Надоградња је завршена, али је било грешака током процеса надоградње."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Тражим застарели софтвер"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Надоградња система је завршена."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Делимична надоградња је завршена."
@@ -812,17 +812,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "потврди идентитет „%(file)s“ за потпис „%(signature)s“ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "извлачим „%s“"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Нисам могао да покренем алатку за надоградњу"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -831,38 +831,38 @@
"овој грешци користећи наредбу „ubuntu-bug ubuntu-release-upgrader-core“ у "
"терминалу."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Потпис алатке за надоградњу"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Алатка за надоградњу"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Добављање није успело"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Нисам успео да добавим надоградњу. Можда је проблем у мрежи. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Потврђивање идентитета није успело"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"Нисам успео да потврдим идентитет. Можда је проблем са мрежом или сервером. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Распакивање није успело"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -870,11 +870,11 @@
"Нисам успео да распакујем надоградњу. Можда постоји проблем са мрежом или "
"сервером. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Проверавање није успело"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -882,12 +882,12 @@
"Нисам успео да извршим проверу надоградње. Можда је проблем са мрежом или "
"сервером. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Не могу да покренем надоградњу"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -896,7 +896,7 @@
"извршавања (noexec). Поново прикачите без „noexec“-а и покрените надоградњу "
"опет."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Порука грешке је „%s“."
@@ -1008,11 +1008,11 @@
"\n"
"Да ли желите да наставите?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Нема „i686“ процесора"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1024,11 +1024,11 @@
"архитектуру. Није могуће надоградити ваш систем на ново Убунту издање са "
"овим хардвером."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Нема „ARMv6“ процесора"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1040,11 +1040,11 @@
"минималну архитектуру. Није могуће надоградити ваш систем на ново Убунту "
"издање са овим хардвером."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Инит није доступан"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1059,11 +1059,11 @@
"\n"
"Да ли сте сигурни да желите на наставите?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "ПАЕ није укључено"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1805,11 +1805,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Преузима алат надоградње издања"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Проверава да ли је могуће надоградити на најновије развојно издање"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1888,20 +1888,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Покрените наредбу „do-release-upgrade“ да надоградите на то издање."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Ажурирање програма"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Доступна је надоградња на Убунту %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Одбили сте надоградњу на Убунту %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Додај излаз прочишћавања"
diff -Nru ubuntu-release-upgrader-17.04.7/po/sv.po ubuntu-release-upgrader-17.10.1/po/sv.po
--- ubuntu-release-upgrader-17.04.7/po/sv.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/sv.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: sv\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server för %s"
@@ -30,20 +30,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Huvudserver"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Anpassade servrar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Kunde inte beräkna post för sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -51,11 +51,11 @@
"Kunde inte hitta några paketfiler. Kanske är detta inte en Ubuntu-skiva "
"eller felaktig arkitektur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Misslyckades med att lägga till cd-skivan"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -70,13 +70,13 @@
"Felmeddelandet var:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Ta bort paket i dåligt tillstånd"
msgstr[1] "Ta bort paket i dåligt tillstånd"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -97,15 +97,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Servern kan vara överbelastad"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Trasiga paket"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -115,7 +115,7 @@
"fortsätter."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -133,11 +133,11 @@
" * Inofficiella programvarupaket som inte tillhandahålls av Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Det här är antagligen ett temporärt problem. Försök igen senare."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -145,15 +145,15 @@
"Om inget stämmer i ditt fall, rapportera felet med kommandot 'ubuntu-bug "
"ubuntu-release-upgrader-core' i en terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Kunde inte beräkna uppgraderingen"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Det gick inte att autentisera vissa paket"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -163,7 +163,7 @@
"nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista "
"med icke-autentiserade paket."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -171,22 +171,22 @@
"Paketet ”%s” är markerat för borttagning men det är svartlistat för att "
"förhindra borttagning."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Det systemkritiska paketet ”%s” har markerats för borttagning."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Försöker att installera svartlistade versionen ”%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Kan inte installera ”%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -195,11 +195,11 @@
"fel genom att använda kommandot 'ubuntu-bug ubuntu-release-upgrader-core' i "
"en terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Kan inte gissa metapaket"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -528,7 +528,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Beräknar ändringarna"
@@ -551,7 +551,7 @@
"tidpunkt."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Det gick inte att hämta uppgraderingarna"
@@ -566,27 +566,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Fel inträffade vid verkställandet"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Återställer ursprungligt systemtillstånd"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Det gick inte att installera uppgraderingarna"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -594,7 +594,7 @@
"Uppgraderingen har avbrutits. Ditt system kan befinna sig i ett oanvändbart "
"tillstånd. En återställning kommer nu att köras (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -611,7 +611,7 @@
"och bifoga filerna i /var/log/dist-upgrade/ tillsammans med felrapporten.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -619,20 +619,20 @@
"Uppgraderingen har avbrutits. Kontrollera din internetanslutning eller "
"installationsmedia och försök igen. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Ta bort föråldrade paket?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Behåll"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Ta bort"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -642,28 +642,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Nödvändiga beroenden är inte installerade"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Det nödvändiga beroendet ”%s” är inte installerat. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Kontrollerar pakethanterare"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Förberedelse av uppgradering misslyckades"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -671,7 +671,7 @@
"Förberedelse av systemet för uppgradering misslyckades, därför startas en "
"felrapporteringsprocess."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -680,12 +680,12 @@
"buggar, installera apport och utför sedan ”apport-bug ubuntu-release-"
"upgrader”."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Hämtning av uppgraderingsförutsättningar misslyckades"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -698,7 +698,7 @@
"\n"
"Dessutom startas en felrapporteringsprocess."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -713,23 +713,23 @@
"För att rapportera en bugg, installera apport och kör sedan ”apport-bug "
"ubuntu-release-upgrader”."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Uppdaterar förrådsinformation"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Misslyckades med att lägga till cd-rom-skivan"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Tyvärr, misslyckades med att lägga till cd-rom-skivan."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Ogiltig paketinformation"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -747,42 +747,42 @@
"aktuella listan över inställda mjukvarukällor.\n"
"Om spegeln är överlastad, försök uppgradera vid ett senare tillfälle."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Hämtar"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Uppgraderar"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Uppgraderingen är färdig"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Uppgraderingen har färdigställts men det inträffade några fel under "
"uppgraderingsprocessen."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Söker efter föråldrad programvara"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Systemuppdateringen är klar."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Den delvisa uppgraderingen färdigställdes."
@@ -811,17 +811,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autentisera ”%(file)s” mot ”%(signature)s” "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "extraherar ”%s”"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Det gick inte att köra uppgraderingsverktyget"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -829,29 +829,29 @@
"Det här är antagligen ett fel i uppgraderingsverktyget. Rapportera det som "
"ett fel med kommandot ”ubuntu-bug ubuntu-release-upgrader-core”."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Uppgraderingsverktygets signatur"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Uppgraderingsverktyg"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Misslyckades med att hämta"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Hämtningen av uppgraderingen misslyckades. Det kan vara ett problem med "
"nätverket. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Autentisering misslyckades"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -859,11 +859,11 @@
"Autentisering av uppgraderingen misslyckades. Det kan vara ett problem med "
"nätverket eller med servern. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Misslyckades med att extrahera"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -871,11 +871,11 @@
"Extraheringen av uppgraderingen misslyckades. Det kan vara ett problem med "
"nätverket eller med servern. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Verifieringen misslyckades"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -883,12 +883,12 @@
"Validering av uppgraderingen misslyckades. Det kan finnas ett problem i "
"nätverket eller med servern. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Kan inte köra uppgraderingen"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -896,7 +896,7 @@
"Detta inträffar oftast av ett system där /tmp är monterad som noexec. "
"Montera om utan noexec och kör uppgraderingen igen."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Felmeddelandet är ”%s”."
@@ -1007,11 +1007,11 @@
"\n"
"Vill du fortsätta?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Ingen i686-processor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1023,11 +1023,11 @@
"minsta arkitektur. Det är inte möjligt att uppgradera ditt system till en ny "
"Ubuntu-utgåva med denna maskinvara."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Ingen ARMv6-processor"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1039,11 +1039,11 @@
"arkitektur. Det är inte möjligt att uppgradera ditt system till en ny Ubuntu-"
"utgåva med denna hårdvara."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Ingen init finns tillgänglig"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1058,11 +1058,11 @@
"\n"
"Är du säker på att du vill fortsätta?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE är inte aktiverat."
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1796,12 +1796,12 @@
msgid "Downloading the release upgrade tool"
msgstr "Hämtar uppgraderingsverktyget för utgåvan"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Kontrollera om uppgradering till den senaste utvecklingsutgåvan är möjlig"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1880,20 +1880,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Kör ”do-release-upgrade” för att uppgradera till den."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Programuppdaterare"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Uppgradering till Ubuntu %(version)s finns tillgänglig"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Du valde att inte uppgradera till Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Lägg till felsökningsutdata"
diff -Nru ubuntu-release-upgrader-17.04.7/po/szl.po ubuntu-release-upgrader-17.10.1/po/szl.po
--- ubuntu-release-upgrader-17.04.7/po/szl.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/szl.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,11 +15,11 @@
"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: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -27,30 +27,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -60,13 +60,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -81,22 +81,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -107,63 +107,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -414,7 +414,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -434,7 +434,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -446,33 +446,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -483,26 +483,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -510,45 +510,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -556,7 +556,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -565,23 +565,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -593,40 +593,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -655,80 +655,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -822,11 +822,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -834,11 +834,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -846,11 +846,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -860,11 +860,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1539,11 +1539,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1611,19 +1611,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ta_LK.po ubuntu-release-upgrader-17.10.1/po/ta_LK.po
--- ubuntu-release-upgrader-17.04.7/po/ta_LK.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ta_LK.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "மெயின் சர்வர்"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Sources.list நுழைவு கணக்கிட முடியவில்லை"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"எந்த தொகுப்பு கோப்புகளையும் கண்டுபிடிக்க முடியவில்லை, ஒருவேளை இந்த ஒரு "
"உபுண்டு டிஸ்க் அல்ல அல்லது தவறான கட்டமைப்பு"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "குறுவட்டு சேர்க்க தோல்வி"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,12 +63,12 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "மோசமான நிலையில் உள்ள தொகுப்பை நீக்கவும்"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -83,15 +83,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "சர்வர் ஓவர்லோட் இருக்கலாம்"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "சிதைந்த தொகுப்புகள்"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -101,7 +101,7 @@
"பயன்படுத்தி சரி செய்யவும்."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -112,64 +112,64 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"இது பெரும்பாலும் ஒரு நிலையற்ற பிரச்சனை, பின்னர் மீண்டும் முயற்சி செய்யுங்கள்."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' நிறுவமுடியவில்லை"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -420,7 +420,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -440,7 +440,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -452,33 +452,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -489,26 +489,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -516,45 +516,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -562,7 +562,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -571,23 +571,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -599,40 +599,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "மேம்படுத்துகிறது"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "கணிணி மேம்பாடு முடிந்தது."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -661,80 +661,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -828,11 +828,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -840,11 +840,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -852,11 +852,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -866,11 +866,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1545,11 +1545,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1617,19 +1617,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/ta.po ubuntu-release-upgrader-17.10.1/po/ta.po
--- ubuntu-release-upgrader-17.04.7/po/ta.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ta.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ta\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s விற்கான சேவையகம்"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "மெயின் சர்வர்"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "தனிபயன் சேவையகங்கள்"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Sources.list நுழைவு கணக்கிட முடியவில்லை"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"எந்த தொகுப்பு கோப்புகளையும் கண்டுபிடிக்க முடியவில்லை, ஒருவேளை இந்த ஒரு "
"உபுண்டு டிஸ்க் அல்ல அல்லது தவறான கட்டமைப்பு"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "குறுவட்டு சேர்க்க தோல்வி"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -63,13 +63,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "மோசமான நிலையில் இருக்கும் தொகுப்பை நீக்கவும்"
msgstr[1] "மோசமான நிலையில் இருக்கும் தொகுப்புகளை நீக்கவும்"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -84,15 +84,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "சர்வர் ஓவர்லோட் இருக்கலாம்"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "சிதைந்த தொகுப்புகள்"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -102,7 +102,7 @@
"பயன்படுத்தி சரி செய்யவும்."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -113,64 +113,64 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"இது பெரும்பாலும் ஒரு நிலையற்ற பிரச்சனை, பின்னர் மீண்டும் முயற்சி செய்யுங்கள்."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "சிலத் தொகுப்புகளை அங்கீகரிப்பதில் பிழை"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' நிறுவமுடியவில்லை"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -421,7 +421,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -441,7 +441,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "மேம்பாடுகளைப் பதிவிறக்க முடியவில்லை"
@@ -453,33 +453,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "மேம்பாடுகளை நிறுவ முடியவில்லை"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -490,26 +490,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "வைத்துக்கொள்க (_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "நீக்குக (_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -517,45 +517,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -563,7 +563,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -572,23 +572,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "களஞ்சியத்தின் தகவல் புதுப்பிக்கப்படுகிறது"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "தவறான தொகுப்பு தகவல்"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -600,40 +600,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "மேம்படுத்துகிறது"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "மேம்படுத்துதல் முடிவடைந்தது"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "கணிணி மேம்பாடு முடிந்தது."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -662,80 +662,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -829,11 +829,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -841,11 +841,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -853,11 +853,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -867,11 +867,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1546,11 +1546,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1618,19 +1618,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/te.po ubuntu-release-upgrader-17.10.1/po/te.po
--- ubuntu-release-upgrader-17.04.7/po/te.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/te.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: te\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s కొరకు సేవిక"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "ప్రధాన సేవిక"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "అనురూపిత సేవికలు"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list పద్దును గణించలేకపోతుంది"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"ఏ ప్యాకేజీ ఫైళ్ళను కనుగొనలేకపోతుంది, బహుశా ఇది ఉబుంటు డిస్కు కాకపోవడమో లేక "
"వేరే నిర్మానానికి చెందినదై ఉండొచ్చు?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CDని జతచేయుటలో విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,13 +67,13 @@
"దోష సందేశం ఏమిటంటే:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "పనికిరాని స్థితిలో ఉన్న ప్యాకేజీని తొలగించండి"
msgstr[1] "పనికిరాని స్థితిలో ఉన్న ప్యాకేజీలను తొలగించండి"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -93,15 +93,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "సర్వర్ పై భారం ఎక్కువగా ఉన్నట్టుంది"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "విరిగిన ప్యాకేజీలు"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -111,7 +111,7 @@
"సరిచేయండి."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -122,25 +122,25 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "ఇది బహుశః ఒక అశాశ్వత సమస్య, దయచేసి మళ్ళీ ప్రయత్నించండి."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "ఉన్నతీకరణను గణించడం వీలుకాదు"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "కొన్ని ప్యాకేజీలను ధృవీకరించుటలో దోషము"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -150,7 +150,7 @@
"కావచ్చు. మీరు తర్వాత మళ్ళీ ప్రయత్నించవచ్చు. ధృవీకరించని ప్యాకేజీల కోసం "
"క్రింద జాబితా చూడండి."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -158,32 +158,32 @@
"'%s' ప్యాకేజీ తొలగించడానికి గుర్తుపెట్టబడింది కాని ఇది తొలగింపు బ్లాక్ "
"లిస్టులో ఉంది."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "ముఖ్యమైన ప్యాకేజి '%s' తొలగించుటకు గుర్తుపెట్టబడింది."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "బ్లాక్ లిస్ట్ చేయబడిన వెర్షను '%s'ను స్థాపించుటకు ప్రయత్నిస్తున్నారు"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'ను స్థాపించడం కుదరదు"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-package ను నిదానించలేదు"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -452,7 +452,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "మార్పులను గణిస్తోంది"
@@ -472,7 +472,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "ఉన్నతీకరణలను డౌన్లోడ్ చేయడం సాధ్యపడదు"
@@ -484,27 +484,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "యదా విధంగా అసలు వ్యవస్థ స్థితికి వస్తోంది"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "ఉన్నతీకరణలు స్థాపించుటకు వీలుకాదు"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -512,7 +512,7 @@
"ఉన్నతీకరణ మధ్యలో రద్దుచేయబడింది. మీ వ్యవస్థ వాడటానికి వీలుకాని స్థితిలో "
"ఉండవచ్చు. ఇపుడు ఒక రికవరీ నడుపబడుతుంది (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -523,7 +523,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -531,20 +531,20 @@
"ఉన్నతీకరణ మధ్యలో రద్దుచేయబడింది. దయచేసి మీ అంతర్జాల అనుసంధానాన్ని లేదా "
"స్థాపక మాధ్యమాన్ని పరీక్షించి మరలా ప్రయత్నించండి. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "కాలంచెల్లిన ప్యాకేజీలను తొలగించాలా?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "ఉంచు(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "తొలగించు(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -554,45 +554,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "అవసరమైన అశ్రితాలు స్థాపించబడలేదు"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "కావలసిన అశ్రితం '%s' స్థాపించబడలేదు. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "ప్యాకేజీ నిర్వాహకి పరీక్షిస్తోంది"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "ఉన్నతీకరణకు సిద్ధంచేయుటలో విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -600,7 +600,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -609,23 +609,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "భాండాగార సమాచారాన్ని నవీకరిస్తోంది"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "cdrom ని జతచేయుటలో విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "క్షమించండి, cdromని జతచేయుటలో విఫలమైనది."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "చెల్లని ప్యాకేజీ సమాచారం"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -637,42 +637,42 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "సాధిస్తోంది"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "ఉన్నతీకరిస్తోంది"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "ఉన్నతీకరణ పూర్తియింది"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"ఉన్నతీకరణ పూర్తయింది కాని ఉన్నతీకరణ ప్రక్రియ జరుగుతుండగా కొన్ని దోషాలు "
"సంభవించాయి."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "కాలంచెల్లిన సాఫ్ట్వేర్ కోసం వెతుకుతోంది"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "వ్యవస్థ ఉన్నతీకరణ పూర్తయింది."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "పాక్షిక ఉన్నతీకరణ పూర్తయింది."
@@ -701,80 +701,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "ఉన్నతీకరణ సాధనాన్ని నడుపుట వీలుకాదు"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "ఉన్నతీకరణ సాధనం సంతకం"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "ఉన్నతీకరణ సాధనం"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "తెచ్చుటలో విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "ధృవీకరణ విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "సంగ్రహించుటలో విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "ప్రమాణీకరణ విఫలమైంది"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "ఉన్నతీకరణని నడుపుట సాధ్యంకాదు"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "దోష సందేశమేమిటంటే '%s'."
@@ -871,11 +871,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 CPU లేదు"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -883,11 +883,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 CPU లేదు"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -895,11 +895,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "ఎటువంటి init లభ్యతలో లేదు"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -909,11 +909,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1606,11 +1606,11 @@
msgid "Downloading the release upgrade tool"
msgstr "విడుదల ఉన్నతీకరణ సాధనాన్ని డౌన్లోడ్ చేస్తోంది"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1678,20 +1678,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/tg.po ubuntu-release-upgrader-17.10.1/po/tg.po
--- ubuntu-release-upgrader-17.04.7/po/tg.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/tg.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: tg\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -115,63 +115,63 @@
" * Бастаҳои нармафзори ғайрирасмӣ аз ҷониби Ubuntu таъмин нашудаанд\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -438,7 +438,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -458,7 +458,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -470,33 +470,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -507,26 +507,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -534,34 +534,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Омодасозии такмилдиҳӣ қатъ шуд"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -570,12 +570,12 @@
"гузориш дар бораи ҳато, \"apport\"-ро насб кунед ва 'apport-bug ubuntu-"
"release-upgrader'-ро иҷро намоед."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -583,7 +583,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -598,23 +598,23 @@
"Барои фиристодани гузориш дар бораи ҳато, \"apport\"-ро насб кунед ва "
"'apport-bug ubuntu-release-upgrader'-ро иҷро намоед."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -626,40 +626,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Такмилдиҳӣ ба анҷом расид"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Такмилдиҳии система ба анҷом расид."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -688,80 +688,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -857,11 +857,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -869,11 +869,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -881,11 +881,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -895,11 +895,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE фаъол нашудааст"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1579,11 +1579,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1651,20 +1651,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Навсозии нармафзор"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/th.po ubuntu-release-upgrader-17.10.1/po/th.po
--- ubuntu-release-upgrader-17.04.7/po/th.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/th.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: th\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "เซิร์ฟเวอร์สำหรับ %s"
@@ -29,30 +29,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "เซิร์ฟเวอร์หลัก"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "เซิร์ฟเวอร์กำหนดเอง"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "ไม่สามารถคำนวนรายการใน sources.list ได้"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "ไม่พบแพคเกจใดเลย บางทีนี่อาจไม่ใช่แผ่น Ubuntu หรือแผ่นอาจเสียหาย?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "ไม่สามารถเพิ่มซีดีได้"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,12 +67,12 @@
"ปัญหาคือ : \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "ลบแพกเกจส่วนที่ใช้การไม่ได้"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -89,15 +89,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "เซิร์ฟเวอร์อาจทำงานหนักเกินไป"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "แพกเกจมีปัญหา"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -106,7 +106,7 @@
"กรุณาซ่อมโดยใช้โปรแกรม synaptic หรือ apt-get ก่อนดำเนินการต่อไป"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -116,26 +116,35 @@
" * Unofficial software packages not provided by Ubuntu\n"
"\n"
msgstr ""
+"เกิดปัญหาที่แก้ไขไม่ได้ขึ้นขณะกำลังคำนวณการอัปเกรด\n"
+"\n"
+" อาจเป็นเพราะ:\n"
+" * อัปเกรดไปเป็น Ubuntu รุ่นก่อนปล่อยตัวจริง\n"
+" * กำลังใช้ Ubuntu ซึ่งรุ่นที่ใช้อยู่เป็นรุ่นก่อนปล่อยตัวจริง\n"
+" * แพคเกจซอฟต์แวร์ไม่เป็นทางการที่ไม่ได้จัดให้โดยทีมงาน Ubuntu\n"
+"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "ปัญหานี้ดูเหมือนว่าจะเป็นปัญหาชั่วคราว, กรุณาลองใหม่อีกครั้งภายหลัง"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
+"ถ้าไม่เป็นเพราะปัญหาดังกล่าว โปรดรายงานปัญหานี้โดยใช้คำสั่ง 'ubuntu-bug "
+"ubuntu-release-upgrader-core' ในเทอร์มินัล"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "ไม่สามารถคำนวนการปรับปรุงได้"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "ผิดพลาดในการยืนยันของจริงในบางแพกเกจ"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -144,39 +153,41 @@
"ไม่สามารถยืนยันความถูกต้องของบางแพกเกจได้ นี่อาจเกี่ยวกับปัญหาด้านเครือข่าย "
"คุณอาจลองอีกครั้งได้ในภายหลัง กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"แพกเกจ '%s' ถูกกาไว้เพื่อถอดถอนแต่แพกเกจนี้อยู่ในรายชื่อที่ไม่ให้ลบออก"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "แพกเกจที่จำเป็น '%s' ถูกกำหนดไว้เพื่อลบออก"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "พยายามติดตั้งรุ่นที่ถูกขึ้นบัญชีดำ '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "ไม่สามารถติดตั้ง '%s' ได้"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
+"ไม่สามารถติดตั้งแพกเกจที่ต้องการได้ โปรดรายงานปัญหานี้โดยใช้คำสั่ง 'ubuntu-"
+"bug ubuntu-release-upgrader-core' ในเทอร์มินัล"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "ไม่สามารถเดาเมตาแพกเกจได้"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -184,6 +195,9 @@
" Please install one of the packages above first using synaptic or apt-get "
"before proceeding."
msgstr ""
+"ระบบของคุณไม่มีแพกเกจ %s หรือ %s และไม่สามารถตรวจสอบได้ว่าคุณกำลังใช้ Ubuntu "
+"รุ่นใด\n"
+" โปรดติดตั้งแพกเกจหนึ่งข้างต้นก่อนใช้ synaptic หรือ apt-get ก่อนทำต่อไป"
#: ../DistUpgrade/DistUpgradeController.py:119
msgid "Reading cache"
@@ -298,6 +312,13 @@
"*No* changes written to a system directory from now until the next reboot "
"are permanent."
msgstr ""
+"การอัปเกรดนี้กำลังทำงานในโหมด sandbox (ทดสอบ) "
+"การเปลี่ยนแปลงทั้งหมดจะถูกเขียนไปยัง '%s' "
+"และจะสูญหายหลังจากเริ่มระบบครั้งต่อไป\n"
+"\n"
+"*จะไม่มี* "
+"การเปลี่ยนแปลงใดๆถูกเขียนไปยังไดเรกทอรีของระบบจากตอนนี้จนกระทั่งเริ่มระบบครั้"
+"งต่อไปอย่างถาวร"
#: ../DistUpgrade/DistUpgradeController.py:443
msgid ""
@@ -309,7 +330,7 @@
#: ../DistUpgrade/DistUpgradeController.py:472
#, python-format
msgid "Can not write to '%s'"
-msgstr ""
+msgstr "ไม่สามารถเขียนลงใน '%s' ได้"
#: ../DistUpgrade/DistUpgradeController.py:473
#, python-format
@@ -318,6 +339,9 @@
"upgrade can not continue.\n"
"Please make sure that the system directory is writable."
msgstr ""
+"ไม่สามารถเขียนลงในไดเรกทอรีระบบ '%s' บนระบบของคุณ "
+"การอัปเกรดไม่สามารถดำเนินการต่อได้\n"
+"โปรดตรวจสอบให้แน่ใจว่าไดเรกทอรีระบบสามารถเขียนได้"
#: ../DistUpgrade/DistUpgradeController.py:484
msgid "Include latest updates from the Internet?"
@@ -347,7 +371,7 @@
#: ../DistUpgrade/DistUpgradeController.py:659
#, python-format
msgid "Not for humans during development stage of release %s"
-msgstr ""
+msgstr "ไม่ใช่สำหรับ humans ระหว่างขั้นตอนการพัฒนาของรุ่น %s"
#: ../DistUpgrade/DistUpgradeController.py:744
#, python-format
@@ -369,6 +393,13 @@
"here it will update all '%s' to '%s' entries.\n"
"If you select 'No' the upgrade will cancel."
msgstr ""
+"ไม่พบรายชื่อแหล่งข้อมูลใดขณะสแกนที่เก็บของคุณ "
+"ปัญหานี้อาจเกิดขึ้นหากคุณเรียกใช้แหล่งข้อมูลภายในหรือหากข้อมูลในแหล่งข้อมูลล้"
+"าสมัย\n"
+"\n"
+"คุณต้องการเขียนแฟ้ม 'sources.list' ของคุณใหม่หรือไม่ ถ้าคุณเลือก 'ใช่' "
+"ที่นี่จะอัปเกรดรายการ '%s' เป็น '%s' ทั้งหมด\n"
+"ถ้าคุณเลือก 'ไม่ใช่' การอัปเกรดจะถูกยกเลิก"
#. hm, still nothing useful ...
#: ../DistUpgrade/DistUpgradeController.py:822
@@ -397,12 +428,17 @@
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
+"การอัปเกรดข้อมูลในที่เก็บมีผลลัพธ์เป็นแฟ้มที่ไม่ถูกต้อง ดังนั้น "
+"กระบวนการรายงานปัญหาจะเริ่มขึ้นทันที"
#: ../DistUpgrade/DistUpgradeController.py:865
msgid ""
"Upgrading the repository information resulted in a invalid file. To report a "
"bug install apport and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
+"การอัปเกรดข้อมูลในที่เก็บมีผลลัพธ์เป็นแฟ้มที่ไม่ถูกต้อง "
+"เมื่อต้องการรายงานปัญหา ให้ติดตั้ง apport และเรียกใช้ 'apport-bug ubuntu-"
+"release-upgrader'"
#: ../DistUpgrade/DistUpgradeController.py:874
msgid "Third party sources disabled"
@@ -461,11 +497,15 @@
"your trash and remove temporary packages of former installations using 'sudo "
"apt-get clean'."
msgstr ""
+"การอัปเกรดถูกยกเลิก การอัปเกรดต้องการพื้นที่ว่างในดิสก์ '%s' รวมทั้งหมด '%s' "
+"โปรดเพิ่มพื้นที่ว่างบน '%s' อย่างน้อย %s "
+"ลบข้อมูลทั้งหมดในถังขยะของคุณและถอดถอนแพกเกจชั่วคราวที่ติดตั้งเมื่อครั้งที่ผ่"
+"านมาโดยใช้คำสั่ง 'sudo apt-get clean'"
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "กำลังคำนวนปริมาณการเปลี่ยนแปลง"
@@ -487,7 +527,7 @@
"คุณสามารถปรับรุ่นต่อได้ในภายหลัง"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น"
@@ -502,33 +542,35 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "คืนระบบสู่สถานะแรกเริ่ม"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "ไม่สามารถปรับปรุงได้"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
+"การอัปเกรดถูกยกเลิก ระบบของคุณอาจอยู่ในสถานะที่ใช้การไม่ได้ "
+"การกู้คืนจะเรียกใช้ตอนนี้ (dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -538,8 +580,14 @@
"and attach the files in /var/log/dist-upgrade/ to the bug report.\n"
"%s"
msgstr ""
+"\n"
+"\n"
+"โปรดรายงานปัญหานี้ โดยเปิดเบราว์เซอร์แล้วเข้าไปที่ "
+"http://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug "
+"และแนบแฟ้ม /var/log/dist-upgrade/ เพื่อรายงานปัญหา\n"
+"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -547,20 +595,20 @@
"การปรับรุ่นถูกเพิกเฉย โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ต "
"หรือสื่อที่ใช้ติดตั้งและลองใหม่ "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "คงไว้"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "เอาออก"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -569,53 +617,60 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "โปรแกรมที่ต้องการไม่ได้ถูกติดตั้ง"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "โปรแกรม '%s' ที่ต้องการไม่ได้ถูกติดตั้ง "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "การเตรียมการปรับปรุงรุ่นมีปัญหา"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
+"การเตรียมการอัปเกรดระบบล้มเหลว ดังนั้น กระบวนการรายงานปัญหาจะเริ่มขึ้น"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
+"การเตรียมการอัปเกรดระบบล้มเหลว เมื่อต้องการรายงานปัญหา ให้ติดตั้ง apport "
+"หลังจากนั้น เรียกใช้คำสั่ง 'apport-bug ubuntu-release-upgrader'"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "เอาแพคเกจที่จำเป็นก่อนการปรับปรุงมาไม่ได้"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
"\n"
"Additionally, a bug reporting process is being started."
msgstr ""
+"ระบบไม่สามารถรับข้อมูลเกี่ยวกับข้อกำหนดเบื้องต้นในการปรับรุ่นได้ "
+"การอัปเกรดจะถูกยกเลิกในขณะนี้และสภาพของระบบจะถูกคืนค่ากลับไปเป็นค่าดั้งเดิม\n"
+"\n"
+"นอกจากนี้ กระบวนการรายงานปัญหาก็จะเริ่มขึ้นด้วยเช่นกัน"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -623,24 +678,29 @@
"To report a bug install apport and then execute 'apport-bug ubuntu-release-"
"upgrader'."
msgstr ""
+"ระบบไม่สามารถรับข้อมูลเกี่ยวกับข้อกำหนดเบื้องต้นในการปรับรุ่นได้ "
+"การอัปเกรดจะถูกยกเลิกในขณะนี้และสภาพของระบบจะถูกคืนค่ากลับไปเป็นค่าดั้งเดิม\n"
+"\n"
+"เมื่อต้องการรายงานปัญหา ให้ติดตั้ง apport และหลังจากนั้น ให้เรียกใช้คำสั่ง "
+"'apport-bug ubuntu-release-upgrader'"
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "เพิ่มแผ่นซีดีล้มเหลว"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "ขออภัยด้วย, ทำการเพิ่มแผ่นซีดีไม่สำเร็จ"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -651,41 +711,49 @@
"In the case of an overloaded mirror, you may want to try the upgrade again "
"later."
msgstr ""
+"หลังจากอัปเดตข้อมูลแพกเกจของคุณแล้ว แพกเกจสำคัญ '%s' ไม่สามารถตั้งขึ้นได้ "
+"ปัญหานี้อาจเกิดขึ้นเนื่องจากคุณไม่มีแหล่งข้อมูลทางการในรายชื่อแหล่งข้อมูลซอฟต"
+"์แวร์ของคุณ "
+"หรือเนื่องจากมีการโหลดข้อมูลจากแหล่งข้อมูลที่คุณกำลังใช้มากเกินไป ดูที่ "
+"/etc/apt/sources.list "
+"สำหรับรายชื่อปัจจุบันของแหล่งข้อมูลซอฟต์แวร์ที่กำหนดค่าอยู่เดิมแล้ว\n"
+"ในกรณีที่มีการโหลดข้อมูลจากแหล่งข้อมูลมากเกินไป "
+"คุณอาจต้องการทดลองการอัปเกรดใหม่อีกครั้งในภายหลัง"
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "กำลังดึงข้อมูล"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "กำลังปรับปรุง"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "ปรับปรุงเสร็จแล้ว"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "การปรับรุ่นสมบูรณ์ แต่เกิดข้อผิดพลาดในระหว่างขั้นตอนการปรับรุ่น"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "ปรับปรุงระบบเสร็จแล้ว"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "การปรับปรุงรุ่นบางส่วนเสร็จสมบูรณ์"
@@ -712,56 +780,59 @@
#: ../DistUpgrade/DistUpgradeFetcherCore.py:73
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
-msgstr ""
+msgstr "ตรวจสอบความถูกต้องของ '%(file)s' ผ่าน '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
-msgstr ""
+msgstr "กำลังแตก '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "ไม่สามารถเรียกใช้เครื่องมือปรับปรุง"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
+"ปัญหานี้ดูเหมือนว่าจะเป็นปัญหาเกี่ยวกับเครื่องมืออัปเกรดมากกว่า "
+"กรุณารายงานปัญหานี้ในฐานะ bug โดยใช้คำสั่ง 'ubuntu-bug ubuntu-release-"
+"upgrader-core'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "รายเซ็นของเครื่องมือปรับปรุง"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "เครื่องมือปรับปรุงรุ่น"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "ไม่สามารถเอามาได้"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงได้ อาจจะเป็นปัญหาในเครือข่าย "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "ไม่สามารถยืนยันว่าเป็นของจริงได้"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "ไม่สามารถเอาออกมาได้"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -769,23 +840,23 @@
"ไม่สามารถแกะข้อมูลปรับปรุงออกมาได้ "
"อาจจะเป็นปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "การตรวจสอบล้มเหลว"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิร์ฟเวอร์ "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "ไม่สามารถเริ่มโปรแกรมปรับปรุงได้"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -793,18 +864,18 @@
"นี้มักจะเกิดโดยที่ระบบ /tmp เชื่อมต่อด้วย noexec "
"โปรดเชื่อมต่อใหม่โดยไม่ต้องใช้ noexec และเรียกใช้ปรับรุ่นอีกครั้ง"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "ข้อผิดพลาดคือ '%s'"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:139
msgid "&Upgrade"
-msgstr ""
+msgstr "&อัปเกรด"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:142
msgid "&Cancel"
-msgstr ""
+msgstr "&ยกเลิก"
#: ../DistUpgrade/DistUpgradeFetcherKDE.py:144
#: ../data/gtkbuilder/ReleaseNotes.ui.h:1
@@ -848,6 +919,7 @@
#: ../DistUpgrade/DistUpgradeQuirks.py:183
msgid "Your graphics hardware may not be fully supported in Ubuntu 14.04."
msgstr ""
+"ฮาร์ดแวร์แสดงผลของคุณอาจไม่ได้รับการสนับสนุนอย่างเต็มที่ใน Ubuntu 14.04"
#: ../DistUpgrade/DistUpgradeQuirks.py:185
msgid ""
@@ -858,11 +930,18 @@
"https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D Do you still "
"want to continue with the upgrade?"
msgstr ""
+"การเรียกใช้สภาพแวดล้อมเดสก์ท็อปของ 'unity' "
+"จะไม่ได้รับการสนับสนุนอย่างเต็มที่โดยฮาร์ดแวร์แสดงผลของคุณ "
+"คุณอาจพบกับสภาพแวดล้อมการทำงานที่ช้ามากหลังการปรับรุ่น คำแนะนำของเรา คือ "
+"ให้ใช้รุ่น LTS ไปก่อนตอนนี้ สำหรับข้อมูลเพิ่มเติม ดูที่ "
+"https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForUnity3D "
+"คุณยังคงต้องการอัปเกรดต่อไปหรือไม่"
#: ../DistUpgrade/DistUpgradeQuirks.py:209
msgid ""
"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
+"ฮาร์ดแวร์แสดงผลของคุณอาจไม่ได้รับการสนับสนุนอย่างเต็มที่ใน Ubuntu 12.04 LTS"
#: ../DistUpgrade/DistUpgradeQuirks.py:211
msgid ""
@@ -871,6 +950,10 @@
"https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to "
"continue with the upgrade?"
msgstr ""
+"การสนับสนุนใน Ubuntu 12.04 LTS สำหรับฮาร์ดแวร์แสดงผล Intel "
+"ของคุณถูกจำกัดและคุณอาจประสบปัญหาหลังการปรับรุ่นได้ สำหรับข้อมูลเพิ่มเติม "
+"ดูที่ https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
+"คุณต้องการทำการอัปเกรดต่อไปหรือไม่"
#: ../DistUpgrade/DistUpgradeQuirks.py:231
msgid ""
@@ -893,11 +976,11 @@
"\n"
"คุณต้องการทำต่อ?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "ไม่มี CPU i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -908,23 +991,27 @@
"แพคเกจทั้งหมดถูกสร้างขึ้นด้วยการเพิ่มประสิทธิภาพต้องเป็นสถาปัตยกรรม i686 "
"น้อยที่สุด มันเป็นไปไม่ได้ที่จะปรุบรุ่นระบบ Ubuntu ของคุณกับฮาร์ดแวร์ใหม่นี้"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ไม่พบ CPU ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
msgstr ""
+"ระบบของคุณใช้ CPU แบบ ARM ซึ่งเก่ากว่าสถาปัตยกรรม ARMv6 แพกเกจทั้งหมดใน "
+"karmic จะถูกสร้างขึ้นด้วยการเพิ่มประสิทธิภาพซึ่งต้องการ ARMv6 "
+"เป็นสถาปัตยกรรมขั้นต่ำสุด และเป็นไปไม่ได้ที่จะอัปเกรดระบบของคุณเป็น Ubuntu "
+"รุ่นใหม่ด้วยฮาร์ดแวร์นี้"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "ไม่พบ init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -933,18 +1020,28 @@
"\n"
"Are you sure you want to continue?"
msgstr ""
+"ระบบของคุณดูเหมือนจะอยู่ในสภาพแวดล้อมแบบจำลองซึ่งไม่มีดีมอน init เช่น Linux-"
+"VServer Ubuntu 10.04 LTS ไม่สามารถทำงานโดยใช้สภาพแวดล้อมประเภทนี้ได้ "
+"ซึ่งต้องอัปเดตค่ากำหนดของเครื่องเสมือนของคุณก่อน\n"
+"\n"
+"คุณแน่ใจหรือว่าคุณต้องการทำต่อไป?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
-msgstr ""
+msgstr "ไม่ได้เปิดใช้งาน PAE อยู่"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
"you must enable PAE (if this is possible) see:\n"
"http://help.ubuntu.com/community/EnablingPAE"
msgstr ""
+"ระบบของคุณใช้ CPU ที่ไม่ได้เปิดใช้งาน PAE อยู่ Ubuntu "
+"สนับสนุนเฉพาะระบบที่ไม่ใช่ PAE ตั้งแต่ Ubuntu 12.04 เท่านั้น "
+"เมื่อต้องการอัปเกรดเป็น Ubuntu รุ่นถัดไป คุณต้องเปิดใช้งาน PAE "
+"(หากเป็นไปได้) ดูที่:\n"
+"http://help.ubuntu.com/community/EnablingPAE"
#: ../DistUpgrade/DistUpgradeMain.py:59
msgid "Sandbox upgrade using aufs"
@@ -980,7 +1077,7 @@
#: ../DistUpgrade/DistUpgradeMain.py:81
msgid "Upgrade to the development release"
-msgstr ""
+msgstr "อัปเกรดเป็นรุ่นการพัฒนา"
#: ../DistUpgrade/DistUpgradeViewGtk3.py:145
#: ../DistUpgrade/DistUpgradeViewKDE.py:233
@@ -1074,6 +1171,10 @@
"report. The upgrade has aborted.\n"
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
+"โปรดรายงานปัญหานี้ในฐานะ bug (หากคุณยังไม่ได้ทำ) และแนบแฟ้ม /var/log/dist-"
+"upgrade/main.log and /var/log/dist-upgrade/apt.log ในการรายงานของคุณ "
+"การอัปเกรดถูกยกเลิก\n"
+"sources.list ดั้งเดิมของคุณจะถูกบันทึกใน /etc/apt/sources.list.distUpgrade."
#: ../DistUpgrade/DistUpgradeViewGtk3.py:555
msgid "Ctrl-c pressed"
@@ -1152,7 +1253,7 @@
#: ../DistUpgrade/DistUpgradeViewKDE.py:753
msgid "&Start Upgrade"
-msgstr ""
+msgstr "&เริ่มการอัปเกรด"
#: ../DistUpgrade/DistUpgradeViewKDE.py:755
#: ../DistUpgrade/DistUpgradeViewKDE.py:800
@@ -1357,21 +1458,25 @@
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
+"การติดตั้งอัปเกรดอาจใช้เวลาหลายชั่วโมง เมื่อการดาวน์โหลดเสร็จแล้ว "
+"คุณไม่สามารถยกเลิกการทำงานได้"
#: ../DistUpgrade/DistUpgradeView.py:409
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
+"การรับข้อมูลและติดตั้งอัปเกรดอาจใช้เวลาหลายชั่วโมง "
+"เมื่อการดาวน์โหลดเสร็จแล้ว คุณไม่สามารถยกเลิกการทำงานได้"
#: ../DistUpgrade/DistUpgradeView.py:414
msgid "Removing the packages can take several hours. "
-msgstr ""
+msgstr "การถอดถอนแพกเกจอาจใช้เวลาหลายชั่วโมง "
#. FIXME: this should go into DistUpgradeController
#: ../DistUpgrade/DistUpgradeView.py:419
msgid "The software on this computer is up to date."
-msgstr ""
+msgstr "ซอฟต์แวร์บนคอมพิวเตอร์นี้เป็นรุ่นล่าสุดแล้ว"
#: ../DistUpgrade/DistUpgradeView.py:420
msgid ""
@@ -1393,7 +1498,7 @@
#: ../DistUpgrade/DistUpgradeViewText.py:81
#, python-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "ความคืบหน้า: [%3i%%]"
#: ../DistUpgrade/DistUpgradeViewText.py:139
msgid ""
@@ -1402,6 +1507,10 @@
"upgrade has aborted.\n"
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
+"โปรดรายงานปัญหานี้และแนบแฟ้ม /var/log/dist-upgrade/main.log and "
+"/var/log/dist-upgrade/apt.log มาในรายงานของคุณด้วย การอัปเกรดถูกยกเลิก\n"
+"แฟ้ม sources.list รุ่นเก่าของคุณได้ถูกบันทึกใน "
+"/etc/apt/sources.list.distUpgrade แล้ว"
#: ../DistUpgrade/DistUpgradeViewText.py:163
msgid "Aborting"
@@ -1603,22 +1712,24 @@
"You can upgrade at a later time by opening Software Updater and click on "
"\"Upgrade\"."
msgstr ""
+"คุณสามารถทำการอัปเกรดได้ในภายหลังโดยเปิด โปรแกรมอัปเดตซอฟต์แวร์ และคลิก "
+"\"อัปเกรด\""
#: ../data/com.ubuntu.release-upgrader.policy.in.h:1
msgid "Perform a release upgrade"
-msgstr ""
+msgstr "ดำเนินการอัปเกรดแบบทั้งหมด"
#: ../data/com.ubuntu.release-upgrader.policy.in.h:2
msgid "To upgrade Ubuntu, you need to authenticate."
-msgstr ""
+msgstr "คุณต้องยืนยันตัวตนเพื่อทำการอัปเกรด Ubuntu"
#: ../data/com.ubuntu.release-upgrader.policy.in.h:3
msgid "Perform a partial upgrade"
-msgstr ""
+msgstr "ดำเนินการอัปเกรดแบบบางส่วน"
#: ../data/com.ubuntu.release-upgrader.policy.in.h:4
msgid "To perform a partial upgrade, you need to authenticate."
-msgstr ""
+msgstr "คุณต้องยืนยันตัวตนเพื่อทำการอัปเกรดแบบบางส่วน"
#: ../do-partial-upgrade:74 ../do-release-upgrade:78
msgid "Show version and exit"
@@ -1640,12 +1751,12 @@
msgid "Downloading the release upgrade tool"
msgstr "กำลังดาวน์โหลดเครื่องมือปรับรุ่น"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"ตรวจสอบว่าสามารถปรับปรุงไปสู่รุ่นพัฒนาล่าสุด(latest devel release)ได้หรือไม่"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "ทดลองอัพเกรดเป็นรุ่นล่าสุดด้วยตัวอัปเกรดจาก $distro-proposed"
@@ -1672,15 +1783,15 @@
#: ../do-release-upgrade:117
msgid "The options --devel-release and --proposed are"
-msgstr ""
+msgstr "ตัวเลือก --devel-release และ --proposed"
#: ../do-release-upgrade:118
msgid "mutually exclusive. Please use only one of them."
-msgstr ""
+msgstr "เป็นตัวเลือกพิเศษเหมือนกัน โปรดเลือกใช้เพียงตัวเลือกเดียว"
#: ../do-release-upgrade:122
msgid "Checking for a new Ubuntu release"
-msgstr ""
+msgstr "กำลังตรวจสอบ Ubuntu รุ่นใหม่"
#: ../do-release-upgrade:134
msgid "Your Ubuntu release is not supported anymore."
@@ -1708,6 +1819,8 @@
"The release upgrade can not be performed currently, please try again later. "
"The server reported: '%s'"
msgstr ""
+"การอัปเกรดรุ่นไม่สามารถทำได้ตอนนี้ โปรดลองใหม่ในภายหลัง "
+"เซิร์ฟเวอร์รายงานว่า: '%s'"
#: ../do-release-upgrade:153
#, c-format
@@ -1718,22 +1831,24 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "เรียก 'do-release-upgrade' เพื่อที่จะทำการปรับปรุง"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
-msgstr ""
+msgstr "โปรแกรมอัปเดตซอฟต์แวร์"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s สามารถปรับรุ่นได้แล้ว"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "คุณได้ตัดสินใจไม่ปรับเป็นรุ่น Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
-msgstr ""
+msgstr "เพิ่มตัวเลือกแสดงกระบวนการแก้ปัญหา"
#, python-format
#~ msgid ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/tl.po ubuntu-release-upgrader-17.10.1/po/tl.po
--- ubuntu-release-upgrader-17.04.7/po/tl.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/tl.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: tl\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server para sa %s"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Pangunahing server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom servers"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Hindi makalkula ang sources.list entry"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Hindi makita ang lokasyon ng alin mang files ng pakete, malamang na hindi "
"ito isang Disc pang-Ubuntu o mali ang arkitektura?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Hindi naidagdag ang CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Ang error message ay:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Tanggalin ang paketeng nasa di-mabuting katayuan"
msgstr[1] "Tanggalin ang mga paketeng nasa di-mabuting katayuan"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -89,15 +89,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Maaaring overloaded ang server"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -107,7 +107,7 @@
"pamamagitan ng synaptic o apt-get bago magpatuloy."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -118,27 +118,27 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Malaki ang posibilidad na ito ay pansamantalang problema lamang, Mangyaring "
"subukan sa muling pagkakataon."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Hindi matantiya ang laki ng upgrade"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Error sa pagtiyak na tama ang ilang mga pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -148,7 +148,7 @@
"pansamantalang problema sa network. Maari mong subukang muli mamaya. Tingnan "
"sa ibaba ang listahan ng hindi matiyak na mga pakete."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -156,32 +156,32 @@
"Ang paketeng '%s' ay minarkahan upang tanggalin ngunit ito'y nasa blacklist "
"ng mga tatanggalin."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Ang kailangang paketeng '%s' ay minarkahang tatanggalin."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Tinatangkang i-install ang blacklisted na bersyong '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Hindi ma-install '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Hindi malaman ang meta-pakete"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -445,7 +445,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Tinatantya ang mga pagbabago"
@@ -465,7 +465,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Hindi ma-download ang mga upgrades"
@@ -477,33 +477,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Error sa pagtakda"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Ibinabalik sa orihinal na kalagayang sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Hindi ma-install ang mga upgrades"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -514,26 +514,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Tanggalin ang mga luma at hindi na kailangang pakete?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Itira"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Tanggalin"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -543,45 +543,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Kailangang depends ay hindi na install"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Ang kinakailangang dependency '%s' ay hindi naka-intall. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Sinusuri ang manager ng pakete"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Nabigo sa paghahanda ng upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Nabigo sa pagkuha ng mga pre-requisite pangupgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -589,7 +589,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -598,23 +598,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Ina-update ang impormasyon ng sisidlan"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Hindi balidong impormasyon ng pakete"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -626,40 +626,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Kinukuha"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Nag-a-upgrade"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Kumpleto na ang pag-upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Naghahanap ng luma at hindi na kailangang software"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Kumpleto na ang pagupgrade sa sistema"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Natapos na ang partial upgrade"
@@ -688,53 +688,53 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Hindi mapatakbo ang upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Signature ng upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Upgrade tool"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Bigo sa pag-fetch"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Bigo sa pag-fetch ng upgrade. Maaaring may problema sa network. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Bigo sa awtentikasyon."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "Bigo sa awtentikasyon. Maaaring may problema sa network o server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Bigo sa pag-extract"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -742,11 +742,11 @@
"Bigo sa pag-extract ng upgrade. Maaaring may problema sa network o sa "
"server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Bigo ang pag-beripika"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -754,18 +754,18 @@
"Tinitiyak na bigo ang upgrade. Maaaring may suliranin sa network o sa "
"server. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Hindi mapatakbo ang proseso ng pagbabago"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Ang mensahe ng pagkakamali ay '%s'."
@@ -861,11 +861,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -873,11 +873,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Walang ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -885,11 +885,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Walang init na available"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -899,11 +899,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1606,11 +1606,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Dina-download ang release upgrade tool"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Tignan kung ang pag-upgrade sa pinakabagong devel release ay maaari"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1684,20 +1684,22 @@
msgstr ""
"Patakbuhin ang 'do-release-upgrade' upang mag-upgrade patungo sa dito."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Mayroong Ubuntu %(version)s Upgrade"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/tr.po ubuntu-release-upgrader-17.10.1/po/tr.po
--- ubuntu-release-upgrader-17.04.7/po/tr.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/tr.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:27+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: tr\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s sunucusu"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Ana sunucu"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Özel sunucular"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "'sources.list' girdisi hesaplanamadı"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Hiçbir paket dosyası bulunamadı, bu bir Ubuntu Diski olmayabilir veya "
"işlemci mimarisi yanlış seçilmiş olabilir mi?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD ekleme başarısız oldu"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,13 +68,13 @@
"Hata iletisi:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Hatalı durumdaki paketi kaldır"
msgstr[1] "Hatalı durumdaki paketleri kaldır"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -95,15 +95,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Sunucu aşırı yüklenmiş olabilir"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Bozuk paketler"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -112,7 +112,7 @@
"etmeden önce lütfen bunları Synaptic veya apt-get kullanarak düzeltin."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -130,12 +130,12 @@
" * Resmi olmayan yazılım paketleri Ubuntu tarafından sağlanmadı\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Bu geçici bir sorun gibi gözüküyor, lütfen daha sonra tekrar deneyiniz."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -143,15 +143,15 @@
"Eğer bunlardan hiçbiri olmazsa lütfen bu hatayı uçbirimden izleyen komut ile "
"bildirin: 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Yükseltme hesaplanamadı"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Bazı paketlerin doğrulanmasında hata oluştu"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -161,7 +161,7 @@
"tekrar deneyebilirsiniz. Doğrulanamamış paketlerin listesi için aşağıya "
"bakınız."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -169,22 +169,22 @@
"'%s' paketi kaldırılması için işaretlenmiş ancak paket kaldırma kara listesi "
"içinde."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Temel '%s' paketi kaldırılma için işaretlenmiş."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Kara listede olan '%s' sürümü kurulmaya çalışılıyor"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' kurulamıyor"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -192,11 +192,11 @@
"Gerekli bir paketin kurulumu imkansızdı. Lütfen uçbirimde 'ubuntu-bug "
"ubuntu-release-upgrader-core' kullanarak bunu bir hata (bug) olarak bildirin."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Üstveri paketi tahmin edilemiyor"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -522,7 +522,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Değişiklikler hesaplanıyor"
@@ -544,7 +544,7 @@
"zamanda güncellemeye devam edebilirsiniz."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Yükseltmeler indirilemedi"
@@ -559,27 +559,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "İşlem sırasında hata oluştu"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Özgün sistem durumuna geri dönülüyor"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Yükseltmeler kurulamadı"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -587,7 +587,7 @@
"Yükseltme iptal edildi. Sisteminiz kullanılmaz bir durumda olabilir. Şimdi "
"bir kurtarma işlemi çalıştırılacak (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -605,7 +605,7 @@
"ekleyin.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -613,20 +613,20 @@
"Yükseltme iptal edildi. İnternet bağlantınızı veya kurulum ortamınızı "
"denetleyip tekrar deneyin. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Kullanılmayan paketler kaldırılsın mı?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Koru"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Kaldır"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -636,28 +636,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Gerekli bağımlılıklar kurulu değil"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Gerekli bağımlılık '%s' kurulu değil. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Paket yöneticisi denetleniyor"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Yükseltme işlemine hazırlanma başarısız oldu"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -665,7 +665,7 @@
"Sistemi yükseltme girişimi başarısız olduğundan bir hata raporu "
"oluşturuluyor."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -673,12 +673,12 @@
"Sistemi yükseltmek üzere hazırlamak başarısız. Hatayı bildirmek için "
"apport'u kurun ve 'apport-bug ubuntu-release-upgrader' komutunu çalıştırın."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Güncelleme önkoşullarının alınması başarısız"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -690,7 +690,7 @@
"\n"
"Buna ek olarak, hata raporu oluşturuluyor."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -704,23 +704,23 @@
"Hatayı bildirmek için apport'u kurun ve 'apport-bug ubuntu-release-upgrader' "
"komutunu çalıştırın."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Depo bilgisi güncelleştiriliyor"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Cdrom eklenmesi başarısız"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Üzgünüz, cdrom ekleme işlemi başarılı değil."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Geçersiz paket bilgisi"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -737,40 +737,40 @@
"kaynaklarının güncel listesi için /etc/apt/sources.list dosyasına göz atın.\n"
"Aşırı yüklenmiş bir yansı durumunda, yükseltmeyi daha sonra tekrar deneyin."
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Getiriliyor"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Yükseltiliyor"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Yükseltme tamamlandı"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Yükseltme tamamlandı, fakat yükseltme esnasında bazı hatalar oluştu."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Kullanılmayan yazılımlar aranıyor"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Sistem yükseltmesi tamamlandı."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Kısmi yükseltme tamamlandı."
@@ -799,17 +799,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "'%(file)s' dosyasını '%(signature)s' imzasına karşı yetkilendir "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "'%s' çıkartılıyor"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Yükseltme aracı çalıştırılamadı."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -818,27 +818,27 @@
"hata olduğunu izleyen komut ile bildirin: 'ubuntu-bug ubuntu-release-"
"upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Yükseltme aracı imzası"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Yükseltme aracı"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Getirme başarısız"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Yükseltme indirilemedi. Ağda bir sorun olabilir. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Kimlik denetimi başarısız oldu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -846,33 +846,33 @@
"Yükseltme için kimlik doğrulama başarısız oldu. Ağda veya sunucuda bir sorun "
"olabilir. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Çıkarılamadı"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Yükseltme çıkartılamadı. Ağ veya sunucu ile ilgili bir sorun olabilir. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Doğrulama başarısız oldu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "Yükseltme onaylanamadı. Ağda ya da sunucuda bir sorun olabilir. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Yükseltme çalıştırılamıyor"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -881,7 +881,7 @@
"kaynaklanır. Lütfen noexec olmadan yeniden bağlayınız ve yükseltmeyi tekrar "
"çalıştırınız."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Hata iletisi '%s'"
@@ -994,11 +994,11 @@
"\n"
"Devam etmek istiyor musunuz?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 işlemci bulunamadı"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -1010,11 +1010,11 @@
"iyileştirilerek inşa edilmiştir. Bu donanımla yeni bir Ubuntu sürümüne "
"yükseltme yapmanız mümkün değildir."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 İşlemci Yok"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1026,11 +1026,11 @@
"ile oluşturulmuştur. Bu donanım ile, sisteminizi yeni bir Ubuntu sürümüne "
"yükseltmek mümkün değil."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Başlatıcı mevcut değil"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1044,11 +1044,11 @@
"öncelikle sanal makinenizin ayarlarını güncelleştirmeniz gerekiyor.\n"
"Devam etmek istediğinizden emin misiniz?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE etkin değil"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1784,11 +1784,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Sürüm yükseltme aracı indiriliyor"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "En son geliştirme sürümüne yükseltme olasılığını denetle"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1868,20 +1868,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Yükseltmek için 'do-release-upgrade' çalıştırın."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Yazılım Güncelleyicisi"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s Yükseltmesi Mevcut"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ubuntu %s sürümüne yükseltmeyi reddettiniz"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Hata ayıklama çıktısını ekle"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ug.po ubuntu-release-upgrader-17.10.1/po/ug.po
--- ubuntu-release-upgrader-17.04.7/po/ug.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ug.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s نىڭ مۇلازىمېتىرى"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "باش مۇلازىمېتىر"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Custom مۇلازىمېتىرلار"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list دىكى مەزمۇنلارنى ھېسابلىغىلى بولمىدى"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"بوغچا ھۆججىتى يوقكەن. قارىغاندا بۇ ئۇبۇنتۇ دىسكىسى ئەمەس ئوخشايدۇ، ياكى "
"نەشرى خاتا ئوخشايدۇ."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CDنى قوشۇش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -69,12 +69,12 @@
"\n"
"‹%s›"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "بۇزۇلغان بوغچىلارنى ئۆچۈر"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -91,15 +91,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "مۇلازىمېتىرنىڭ يۈكى ئېشىپ كەتكەندەك قىلىدۇ"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "بۇزۇلغان بوغچىلار"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -109,7 +109,7 @@
"ئىشلىتىپ تۈزىتىڭ."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -127,11 +127,11 @@
" ئۇبۇنتۇدىن باشقا تەمىنلىگۈچىلەر تەمىنلىگەن بولاقلار كەلتۈرۈپ چىقارغان\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "بۇ ۋاقىتلىق مەسىلىدەك قىلىدۇ، كېيىن يەنە قايتا سىناپ كۆرۈڭ."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -139,15 +139,15 @@
"ھېچقايسى ئىشلىمىسە، تېرمىنالدا تۇرۇپ ‹ubuntu-bug ubuntu-release-upgrader-"
"core› بۇيرۇقىنى ئىشلىتىپ كەمتۈك مەلۇم قىلىڭ."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "يۈكسەلدۈرۈشنى ھېسابلاش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "بەزى بوغچىلارنى دەلىللەشتە خاتالىق كۆرۈلدى."
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -156,7 +156,7 @@
"بىر قىسىم بوغچىلارنى دەلىللىگىلى بولمىدى. بۇ ۋاقىتلىق مەسىلە. كېيىن يەنە "
"سىناپ كۆرسىڭىز بولىدۇ. دەلىللەش مۇمكىن بولمىغان بوغچىلار تۆۋەندىكىچە:"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -164,22 +164,22 @@
"بوغچا ‹%s› غا ئۆچۈرۈش بەلگىسى قويۇلۇپتۇ، بىراق ئۇ ئۆچۈرۈش قارا تىزىملىكىدە "
"بار ئىكەن."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "زۆرۈر بولغان ‹%s› بوغچىغا ئۆچۈرۈش بەلگىسى قويۇلۇپتۇ."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "قارا تىزىملىكتىكى نەشرى '%s' نى ئورناتماقچى بولۇۋاتىدۇ"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "‹%s› نى ئورنىتالمىدى"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -187,11 +187,11 @@
"تەلەپ قىلىنغان بوغچىنى ئورناتقىلى بولمىدى. تېرمىنالدا «ubuntu-bug ubuntu-"
"release-upgrader-core» بۇيرۇقىنى ئىجرا قىلىپ، كەمتۈك مەلۇماتى يوللاڭ."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta بوغچىلارنى قىياس قىلغىلى بولمىدى"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -516,7 +516,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "ئۆزگىرىشلەرنى ئېنىقلاۋاتىدۇ"
@@ -538,7 +538,7 @@
"كەلتۈرۈلىدۇ. يۈكسەلدۈرۈش مەشغۇلاتىنى كېيىن يەنە قىلغىلى بولىدۇ."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "يۈكسەلدۈرمىلەرنى چۈشۈرگىلى بولمىدى"
@@ -552,27 +552,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "commit قىلىۋاتقاندا خاتالىق كۆرۈلدى"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "ئەسلىدىكى سىستېما ھالىتىگە قايتۇرۇش"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "يۈكسەلدۈرمىلەرنى ئورناتقىلى بولمىدى"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -581,7 +581,7 @@
"قالىدۇ. ئەسلىگە كەلتۈرۈش مەشغۇلاتى(dpkg --configure -a) ھازىرلا ئېلىپ "
"بېرىلىدۇ."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -598,7 +598,7 @@
"ھۆججەتلەرنى مەلۇماتقا قوشۇپ ئەۋەتىڭ.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -606,20 +606,20 @@
"يۈكسەلدۈرۈش توختىتىلدى. ئىنتېرنېت باغلىنىشىنى ياكى ئورنىتىش دىسكىسىنى "
"تەكشۈرۈڭ ۋە قايتا قىلىڭ. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "كېرەكسىز بوغچىلارنى ئۆچۈرسۇنمۇ؟"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "تەگمە(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "چىقىرىۋەت(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -628,28 +628,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "زۆرۈر بېقىنمىلار ئورنىتىلمىغان"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "زۆرۈر بېقىنما ‹%s› ئورنىتىلمىغان. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "بوغچا باشقۇرغۇچنى تەكشۈرۈۋاتىدۇ"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "يېڭىلاشقا تەييارلىنىش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -657,7 +657,7 @@
"سىستېمىنى يۈكسەلدۈرۈش تەييارلىقى مەغلۇپ بولدى، شۇڭا كەمتۈك مەلۇم قىلىش "
"مەشغۇلاتى باشلىنىدۇ."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -665,12 +665,12 @@
"يۈكسەلدۈرۈش ئۈچۈن سىستېمىنى تەييارلىيالمىدى. خاتالىق مەلۇم قىلىشتا apport "
"نى ئورنىتىپ ئاندىن 'apport-bug ubuntu-release-upgrader' نى ئىجرا قىلىڭ."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "يۈكسەلدۈرۈشكە زۆرۈر بولغان مەزمۇنلارنى ئېلىش مەغلۇپ بولدى."
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -682,7 +682,7 @@
"\n"
"يەنە كەمتۈك مەلۇم قىلىش جەريانى باشلىنىۋاتىدۇ."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -696,23 +696,23 @@
"خاتالىق مەلۇم قىلىشتا apport نى ئورنىتىپ ئاندىن 'apport-bug ubuntu-release-"
"upgrader' نى ئىجرا قىلىڭ."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "خەزىنە ئۇچۇرىنى يېڭىلاۋاتىدۇ"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "cdrom نى قوشۇش مەغلۇپ بولدى."
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "كەچۈرۈڭ، cdrom قوشۇش مۇۋەپپەقىيەتلىك بولمىدى."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "ئىناۋەتسىز بوغچا ئۇچۇرى"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -724,41 +724,41 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "تۇتۇۋاتىدۇ"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "يۈكسەلدۈرۈۋاتىدۇ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "يۈكسەلدۈرۈش تامام"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"نەشرنى ئۆرلىتىش تاماملاندى، بىراق نەشرىنى ئۆرلىتىش جەريانىدا خاتالىق كۆرۈلدى."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "كېرەكسىز دېتاللارنى ئىزدەۋاتىدۇ"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "سىستېمىنى يۈكسەلدۈرۈش تاماملاندى."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "قىسمى يۈكسەلدۈرۈش تاماملاندى."
@@ -787,17 +787,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "'%(signature)s' غا قارتا '%(file)s' نى دەلىللەش "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "يېيىۋاتقىنى ‹%s›"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "يۈكسەلدۈرۈش قورالىنى ئىجرا قىلغىلى بولمىدى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -805,27 +805,27 @@
"يۈكسەلدۈرۈش قورالىدا كەمتۈك باردەك قىلىدۇ. بۇ كەمتۈكنى ‹ubuntu-bug ubuntu-"
"release-upgrader-core› بۇيرۇقىنى ئىشلىتىپ مەلۇم قىلىڭ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "يۈكسەلدۈرۈش قورالى ئىمزاسى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "يۈكسەلدۈرۈش قورالى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "ئېلىش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "يۈكسەلدۈرمىنى ئېلىش مەغلۇپ بولدى. توردا مەسىلە باردەك قىلىدۇ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "كىملىك دەلىللەش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -833,11 +833,11 @@
"يۈكسەلدۈرمىنى دەلىللەش مەغلۇپ بولدى. تور ياكى مۇلازىمېتىردا مەسىلە باردەك "
"قىلىدۇ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "يېيىش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -845,11 +845,11 @@
"يۈكسەلدۈرمىنى يېيىش مەغلۇپ بولدى. توردا ياكى مۇلازىمېتىردا مەسىلە باردەك "
"قىلىدۇ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "ئىسپاتلاش مەغلۇپ بولدى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -857,12 +857,12 @@
"يۈكسەلدۈرمىنى تەكشۈرۈش مەغلۇپ بولدى. تور ياكى مۇلازىمېتىردا مەسىلە باردەك "
"قىلىدۇ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "يۈكسەلدۈرۈشنى ئىجرا قىلغىلى بولمىدى"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -871,7 +871,7 @@
"كۆرۈلىدۇ./tmp نى noexec ئىشلەتمەي قايتا ئېگەرلەڭ ۋە يۈكسەلدۈرۈشنى قايتا "
"ئىجرا قىلىڭ."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "خاتالىق ئۇچۇرى ‹%s›."
@@ -983,11 +983,11 @@
"\n"
"داۋاملاشتۇرامسىز?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "i686 تىپلىق CPU ئەمەس"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -999,11 +999,11 @@
"ئىشلىتىپ قۇرۇلغان. بۇ كومپيۇتېرىڭىزدا، سىستېمىڭىزنى ئۇبۇنتۇنىڭ يېڭى نەشرىگە "
"يۈكسەلدۈرەلەيسىز."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "ARMv6 تىپىدىكى CPU ئەمەس"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1014,11 +1014,11 @@
"كونا. karmic تىكى بارلىق بوغچىلار ARMv6 غا ماسلاشتۇرۇلغان بولۇپ، "
"كومپيۇتېرىڭىزدا ئىشلەتكىلى بولمايدۇ. شۇڭا سىستېمىنى يېڭىلىيالمايسىز."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "init يوقكەن"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1033,11 +1033,11 @@
"\n"
"داۋاملاشتۇرامسىز?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "ئەمەلىي ئادرېسنى كېڭەيتىش ئىقتىدارى (PAE) قوزغىتىلمىغان"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1758,11 +1758,11 @@
msgid "Downloading the release upgrade tool"
msgstr "نەشر يۈكسەلدۈرۈش قورالىنى چۈشۈرۈۋاتىدۇ"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "مۇمكىن ئىجادىيەت باسقۇچىدىكى نەشرنى تەكشۈرسۇن"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1842,20 +1842,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "يۈكسەلدۈرۈش ئۈچۈن 'do-release-upgrade' نى ئىجرا قىلىڭ."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "يۇمشاق دېتال يېڭىلىغۇ"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "ئۇبۇنتۇ %(version) نىڭ يۈكسەلدۈرمىسى بار ئىكەن"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "ئۇبۇنتۇ %s غا يۈكسەلدۈرۈشنى رەت قىلدىڭىز"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "سازلاش نەتىجىلىرىنى چىقىرىشنى قوشۇش"
diff -Nru ubuntu-release-upgrader-17.04.7/po/uk.po ubuntu-release-upgrader-17.10.1/po/uk.po
--- ubuntu-release-upgrader-17.04.7/po/uk.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/uk.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: uk\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Сервер для %s"
@@ -29,20 +29,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Основний сервер"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Сервери користувача"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Неможливо підрахувати запис sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -50,11 +50,11 @@
"Не вдалося знайти жодного файлу пакунків; можливо, це не диск Ubuntu або "
"диск для іншої архітектури?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Не вдалося додати компакт-диск"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,14 +68,14 @@
"Повідомлення про помилку:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Вилучити пакунок, що знаходиться в поганому стані"
msgstr[1] "Вилучити пакунки, що знаходяться в поганому стані"
msgstr[2] "Вилучити пакунки, що знаходяться в поганому стані"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -100,15 +100,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Схоже, що сервер перенавантажений"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Пошкоджені пакунки"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -117,7 +117,7 @@
"цією програмою. Будь-ласка, виправіть їх програмами synaptic або apt-get."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -135,25 +135,25 @@
" * Пакети неофіційного програмного забезпечення не постачаються Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Перелік змін ще не готовий, спробуйте пізніше."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Не вдалося розрахувати оновлення"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Помилка аутенфікації деяких пакетів"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -163,39 +163,39 @@
"мережі. Можливо, Ви захочете спробувати пізніше. Список не перевірених "
"пакетів надано нижче."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Пакунок '%s' помічено для видалення, але він в чорному списку видалення."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Важливий пакунок '%s' помічено для видалення."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Спроба встановити версію '%s' чорного списку"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Не можливо встановити '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Не можливо підібрати meta-пакунок"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -524,7 +524,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Проводиться аналіз змін"
@@ -546,7 +546,7 @@
"Ви зможете продовжити оновлення пізніше."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Неможливо завантажити пакунки для оновлення системи"
@@ -561,27 +561,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Помилка при фіксації"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Відновлення первісного стану системи"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Неможливо провести оновлення системи"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -589,7 +589,7 @@
"Оновлення було перервано. Ваша система може бути в нестабільному стані. "
"Зараз буде запущено процес відновлення (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -600,7 +600,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -608,20 +608,20 @@
"Оновлення було перервано. Будь ласка, перевірте Ваше з'єднання з Інтернетом "
"чи носій для встановлення та спробуйте знову. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Видалити застарілі пакунки?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Залишити"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "Видалити"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -631,28 +631,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Необхідний пакет (залежність) не встановлений"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Необхідний пакет (залежність) '%s' не встановлений. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Перевірка програми управління пакунками"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Підготовка до оновлення не вдалася"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -660,7 +660,7 @@
"Підготовка системи до оновлення закінчилася невдало. Почато процес "
"звітування про помилку."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -669,12 +669,12 @@
"помилку, встановіть apport та виконайте команду 'apport-bug ubuntu-release-"
"upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Помилка отримання необхідних файлів для оновлення"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -687,7 +687,7 @@
"\n"
"Також почато процес звітування про помилку."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -701,23 +701,23 @@
"Повідомити про помилку встановлення apport й потім виконати 'apport-bug "
"ubuntu-release-upgrader'."
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Оновлення інформації про сховище"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Помилка при підключенні CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "На жаль, не вдалося підключити CD-ROM"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Невірна інформація про пакунок"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -729,40 +729,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Отримання"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Процес оновлення"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Оновлення завершено"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Оновлення було завершено, але в його процесі виникли деякі помилки."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Пошук застарілих програм"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Оновлення системи завершено."
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Часткове оновлення завершене."
@@ -791,44 +791,44 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "автентифікувати '%(file)s' замість '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "видобування '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Неможливо провести апргрейд системи"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Підпис інструменту оновлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Інструмент оновлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Не вдалося отримати"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Не вдалося отримати оновлення. Це може бути викликано проблемою у мережі. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Помилка аутентифікації"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -836,11 +836,11 @@
"Автентифікація оновлення зазнала краху. Це може бути викликано проблемою з "
"мережею або сервером. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Не вдалося розпакувати"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -848,11 +848,11 @@
"Не вдалося розпакувати оновлення. Можливо, виникла проблема в мережі або на "
"сервері. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Перевірка не вдала"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -860,12 +860,12 @@
"Не вдалося перевірити наявність оновлень. Можливо, виникла проблема в мережі "
"або на сервері. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Не вдається почати оновлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -873,7 +873,7 @@
"Це, зазвичай, виникає в системах з /tmp змонтованому з noexec. Перемонтуйте, "
"будь-ласка, без noexec та виконайте оновлення знов."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Повідомлення про помилку: '%s'."
@@ -980,11 +980,11 @@
"\n"
"Чи хочете ви продовжувати?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Немає процесора i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -996,11 +996,11 @@
"архітектуру. Неможливо оновити систему до нової версії Ubuntu на цьому "
"комп’ютері."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Немає ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -1012,11 +1012,11 @@
"як мінімум. Оновлення вашої системи до нового випуску Ubuntu неможливе на "
"даному обладнанні."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Служба init недоступна"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -1032,11 +1032,11 @@
"\n"
"Ви впевнені, що хочете продовжити?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "PAE не увімкнуто"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1778,13 +1778,13 @@
msgid "Downloading the release upgrade tool"
msgstr "Завантаження засобу оновлення випуску"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Перевірити можливість оновлення до останнього випуску, що перебуває в стані "
"розробки"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1864,20 +1864,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Виконайте команду 'do-release-upgrade' для оновлення."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "Оновлювач програм"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Доступне оновлення Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ви відмовились від оновлення до Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Додати результати відладки"
diff -Nru ubuntu-release-upgrader-17.04.7/po/ur.po ubuntu-release-upgrader-17.10.1/po/ur.po
--- ubuntu-release-upgrader-17.04.7/po/ur.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/ur.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: ur\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Server for %s"
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "مرکزی سرور"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "سی ڈی شامل کرنے میں ناکام"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "ہوسکتا ہے کہ سرور پر حد سے ذیادہ بھار آگیا ھو۔"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "ٹوٹا ہوا پیکج"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "کسی نقص کی باعث کئی پیکجوں کی تصدیق نہیں ہوسکی"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/uz.po ubuntu-release-upgrader-17.10.1/po/uz.po
--- ubuntu-release-upgrader-17.04.7/po/uz.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/uz.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: uz\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s uchun server"
@@ -28,20 +28,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Asosiy server"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Boshqa serverlar"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "sources.list elementlarini hisoblab bo‘lmadi"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -49,11 +49,11 @@
"Paket fayllari joylashgan joyni aniqlab bo‘lmadi. Balki, u Ubuntu diski "
"emasdir yoki arxitektura xatosi?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "CD qo‘shish amalga oshmadi"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -68,12 +68,12 @@
"Xatolik xabari:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Yomon holatdagi paketni olib tashlash"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -90,15 +90,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Сервер қайта юкланган бўлиши мумкин"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Бузилган пакетлар"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -108,7 +108,7 @@
"фойдаланиб, тўғриланг."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -119,27 +119,27 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Бу вақтинчалик муаммо бўлиши мумкин, илтимос, сал кейинроқ қайтадан уриниб "
"кўринг."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Янгилашни чамалаб бўлмади"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Баъзи пакетларни тасдиқдан ўтказишда хато"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -149,39 +149,39 @@
"вақтинчалик муаммо бўлиши мумкин. Қуйида тасдиқдан ўтмаган пакетлар рўйхати "
"келтирилган."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"'%s' пакети олиб ташлаш учун белгиланди, аммо у олиб ташлаш рўйхатида эмас."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "'%s' муҳим пакетлар ўчириш учун белгиланди."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Қора рўйхатга киритилган '%s' версиясини ўрнатишга уриниш"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'ни ўрнатиб бўлмайди"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "meta-package'ни аниқлаб бўлмади"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -434,7 +434,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -454,7 +454,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -466,33 +466,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -503,26 +503,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -530,45 +530,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -576,7 +576,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -585,23 +585,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -613,40 +613,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -675,80 +675,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -842,11 +842,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -854,11 +854,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -866,11 +866,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -880,11 +880,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1559,11 +1559,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1631,20 +1631,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/vi.po ubuntu-release-upgrader-17.10.1/po/vi.po
--- ubuntu-release-upgrader-17.04.7/po/vi.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/vi.po 2017-04-24 21:05:20.000000000 +0000
@@ -14,12 +14,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: vi\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "Máy chủ dành cho %s"
@@ -27,20 +27,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "Máy chủ chính"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "Tự chọn máy chủ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "Không thể thống kê các mục trong sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -48,11 +48,11 @@
"Không tìm thấy các gói phần mềm, có thể do không đúng đĩa cài Ubuntu hoặc "
"sai hệ thống?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "Lỗi đọc dữ liệu từ CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -66,12 +66,12 @@
"Thông báo lỗi là:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Gỡ bỏ các gói ở tình trạng xấu"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -87,15 +87,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "Máy chủ có thể bị quá tải"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Gói bị lỗi"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
@@ -104,7 +104,7 @@
"này. Hãy sửa chúng bằng phần mềm synaptic hoặc apt-get trước khi tiếp tục."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -115,11 +115,11 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "Nhiều khả năng đây chỉ là vấn đề tạm thời, vui lòng thử lại sau."
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -127,15 +127,15 @@
"Nếu không cái nào trong chúng được áp dụng, xin hãy báo cáo lỗi này bằng "
"cách sử dụng tác lệnh 'ubuntu-bug ubuntu-release-upgrader-core' ở trong trạm."
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "Không thể tính được dung lượng cần nâng cấp"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "Gặp lỗi khi đang xác thực một số gói"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
@@ -145,7 +145,7 @@
"vui lòng thử lại sau. Bên dưới là danh sách các gói chưa được xác thực đầy "
"đủ."
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -153,22 +153,22 @@
"Gói phần mềm '%s' được đánh dấu đề gỡ bỏ nhưng nó nằm trong danh sách các "
"phần mềm không thể gỡ bỏ."
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Gói phần mềm quan trọng '%s' sẽ bị gỡ bỏ."
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Đang cố gắng để cài đặt phiên bản danh sách đen '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "Không thể cài đặt '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
@@ -176,11 +176,11 @@
"Không thể cài đặt gói theo yêu cầu. Xin hãy báo cáo lỗi này bằng cách sử "
"dụng tác lệnh 'ubuntu-bug ubuntu-release-upgrader-core' ở trong trạm."
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "Không thể đoán được gói gốc"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -485,7 +485,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "Tính toán các thay đổi cần thực hiện"
@@ -507,7 +507,7 @@
"đầu. Sau này bạn có thể tiếp tục việc nâng cấp."
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "Không thể tải các gói nâng cấp xuống"
@@ -521,27 +521,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "Lỗi trong quá trình thực hiện"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "Khôi phục hệ thống về trạng thái ban đầu"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "Không thể cài đặt các gói nâng cấp"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -549,7 +549,7 @@
"Quá trình nâng cấp bị hủy bỏ. Trạng thái của hệ thống không thể sử dụng "
"được. Chạy hồi phục ngay (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -566,7 +566,7 @@
"đính kèm tệp ở đường dẫn /var/log/dist-upgrade/ cho trình báo cáo lỗi.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -574,20 +574,20 @@
"Quá trình nâng cấp bị hủy bỏ. Xin kiểm tra lại kết nối Internet hay cài đặt "
"các phương tiện và thử lại. "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "Xóa các gói không còn dùng nữa"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Giữ lại"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Xóa bỏ"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -596,28 +596,28 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "Các gói phụ thuộc chưa được cài đặt"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Gói phụ thuộc '%s' chưa được cài đặt. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "Đang kiểm tra trình quản lý gói"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "Quá trình chuẩn bị để nâng cấp thất bại"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -625,18 +625,18 @@
"Gặp lỗi trong việc chuẩn bị hệ thống cho việc nâng cấp nên một tiến trình "
"báo cáo lỗi đang được bắt đầu."
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "Quá trình tải các gói phụ thuộc cần thiết để nâng cấp thất bại"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -648,7 +648,7 @@
"\n"
"Ngoài ra, một tiến trình báo cáo lỗi đang được bắt đầu."
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -657,23 +657,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "Cập nhật thông tin về các nguồn cập nhật"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "Không thể thêm cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "Rất tiếc, việc thêm CD/DVD không thành công."
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "Thông tin gói không hợp lệ"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -685,40 +685,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "Đang lấy về"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "Đang nâng cấp"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "Nâng cấp hoàn tất"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "Việc nâng cấp đã hoàn thành nhưng có vài lỗi đã xảy ra."
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "Đang tìm các phần mềm không còn dùng nữa"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "Quá trình nâng cấp hệ thống đã hoàn thành"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "Quá trình nâng cấp từng phần kết thúc."
@@ -747,17 +747,17 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "xác thực '%(file)s' với '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "giải nén '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "Không thể chạy công cụ nâng cấp"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
@@ -765,61 +765,61 @@
"Có lẽ đây là lỗi trong trình nâng cấp. Xin hãy báo cáo lỗi bằng cách sử dụng "
"tác lệnh 'ubuntu-bug ubuntu-release-upgrader-core'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "Chữ ký của công cụ nâng cấp"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "Công cụ nâng cấp"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "Lỗi tải xuống"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Lỗi tải xuống bản nâng cấp. Có thể là do vấn đề về mạng. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "Lỗi xác thực"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"Lỗi xác thực bản nâng cấp. Có thể có vấn đề về mạng hoặc với máy chủ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "Lỗi giải nén"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Lỗi giải nén bản nâng cấp. Có thể có vấn đề về mạng hoặc với máy chủ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "Việc xác nhận thất bại"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"Lỗi xác minh gói nâng cấp. Có thể có vấn đề về mạng hoặc với máy chủ. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "Không thể thực hiện quá trình nâng cấp"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -827,7 +827,7 @@
"Điều này thường bị gây ra bởi một hệ thống có /tmp được gắn với tuỳ chọn "
"noexec. Hãy gắn lại mà không có noexec rồi chạy lại nâng cấp."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "Thông báo lỗi: '%s'"
@@ -940,11 +940,11 @@
"\n"
"Bạn có muốn tiếp tục?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "Không dùng bộ xử lý i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -956,11 +956,11 @@
"cứng với bộ xử lý tối thiểu là i686. Bạn không thể nâng cấp hệ thống lên đến "
"bản Ubuntu tiếp theo với cấu hình phần cứng này."
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "Không có ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -972,11 +972,11 @@
"thiểu. Không thể để nâng cấp hệ thống của bạn với một bản phát hành Ubuntu "
"mới với phần cứng này."
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "Không init nào có sẵn"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -992,11 +992,11 @@
"\n"
"Bạn có chắc chắn muốn tiếp tục không?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1711,11 +1711,11 @@
msgid "Downloading the release upgrade tool"
msgstr "Đang tải công cụ nâng cấp bản phát hành"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Kiểm tra nếu có bản mới nhất phát hành trong giai đoạn phát triển"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1794,20 +1794,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Chạy 'do-release-upgrade' để nâng cấp."
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s hiện đang sẵn sàng"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Bạn đã từ chối việc nâng cấp lên Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "Thêm kết xuất tìm lỗi"
diff -Nru ubuntu-release-upgrader-17.04.7/po/xh.po ubuntu-release-upgrader-17.10.1/po/xh.po
--- ubuntu-release-upgrader-17.04.7/po/xh.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/xh.po 2017-04-24 21:05:20.000000000 +0000
@@ -16,12 +16,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: xh\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -29,30 +29,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -62,13 +62,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -83,22 +83,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -109,63 +109,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -416,7 +416,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -436,7 +436,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -448,33 +448,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -485,26 +485,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -512,45 +512,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -558,7 +558,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -567,23 +567,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -595,40 +595,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -657,80 +657,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -824,11 +824,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -836,11 +836,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -848,11 +848,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -862,11 +862,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1541,11 +1541,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1613,19 +1613,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/po/zh_CN.po ubuntu-release-upgrader-17.10.1/po/zh_CN.po
--- ubuntu-release-upgrader-17.04.7/po/zh_CN.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/zh_CN.po 2017-04-24 21:05:20.000000000 +0000
@@ -17,12 +17,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:51+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s 的服务器"
@@ -30,30 +30,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "主服务器"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "自定义服务器"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "无法计算 sources.list 条目"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "无法定位任何软件包文件,也许这张不是 Ubuntu 光盘,或者其架构错误?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "添加 CD 失败"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -67,12 +67,12 @@
"错误信息是:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "卸载状态异常的软件包"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -86,22 +86,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "服务器可能已过载"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "破损的软件包"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr "您的系统包含有本软件不能修复的破损软件包,在您继续前请先用新立得或者 apt-get 修复它们。"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -119,64 +119,64 @@
" *不是由 Ubuntu 提供的非官方软件包\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "很可能发生了一个传输问题,请稍后重试。"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
"如果这些都不生效,请在终端中使用命令 'ubuntu-bug ubuntu-release-upgrader-core' 来报告 bug。"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "无法计算升级"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "一些软件包认证出错"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr "一些软件包无法通过签名验证。这可能是暂时的网络问题,您可以在稍后再试。以下是未认证软件包的列表。"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "软件包“%s”标记为可移除,但它已在移除黑名单中。"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "必要的软件包“%s”被标记为移除。"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "尝试安装黑名单版本“%s”"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "无法安装 '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr "无法安装所需的软件包。请在终端使用“ubuntu-bug ubuntu-release-upgrader-core”将其报为 bug。"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "无法猜出元软件包"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -457,7 +457,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "正在计算变更"
@@ -477,7 +477,7 @@
msgstr "升级将会取消,系统会恢复到原始状态。您可以在之后继续升级。"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "无法下载升级包"
@@ -489,33 +489,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "确认时出错"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "正在恢复原始系统状态"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "无法安装升级"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr "更新已取消。您的系统可能处在不稳定状态。正在恢复 (dpkg --configure -a)。"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -531,26 +531,26 @@
"upgrader/+filebug 并将 /var/log/dist-upgrade/ 文件作为附件上传到问题报告。\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr "更新已取消。请检查您的因特网连接或安装媒体,然后再试一遍。 "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "删除陈旧的软件包?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "保持(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "删除(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -558,34 +558,34 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "需要的依赖关系未安装"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "需要的依赖关系“%s”未安装 。 "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "正在检查软件包管理器"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "升级准备失败"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "更新时的系统准备失败,已启动错误报告进程。"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
@@ -593,12 +593,12 @@
"更新时的系统准备失败。如果您想报告这个错误,请安装 apport 软件,然后执行 apport-bug ubuntu-release-upgrader "
"命令。"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "准备升级失败"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -609,7 +609,7 @@
"\n"
"此外,错误报告进程也将启动。"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -621,23 +621,23 @@
"\n"
"如果您想报告这个错误,请安装 apport 软件,然后执行 apport-bug ubuntu-release-upgrader 命令。"
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "正在更新软件仓库信息"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "添加光驱失败"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "对不起,没有成功添加光驱。"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "无效的软件包信息"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -649,40 +649,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "正在获取"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "正在升级"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "升级完成"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "升级已完成,但其间出现错误。"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "正在搜索废弃的软件"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "系统升级完成"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "部分升级完成。"
@@ -711,81 +711,81 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "使用 '%(signature)s' 对 '%(file)s' 进行验证 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "正在提取 '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "不能运行升级工具"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
"这很有可能是升级工具中的一个 bug。请使用命令“ubuntu-bug ubuntu-release-upgrader-core”将其报为 bug。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "升级工具签名"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "升级工具"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "下载失败"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "获取升级信息失败。可能网络有问题。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "认证失败"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "认证升级信息失败。可能是网络或服务器的问题。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "提取失败"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "提取升级信息失败。可能是网络或服务器的问题。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "验证失败"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "验证升级程序失败。可能是网络或服务器的问题。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "不能运行升级"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr "可能的原因是系统的 /tmp 目录无可执行权限。请以可执行权限重新挂载该目录,重新升级。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "错误信息是“%s”。"
@@ -886,11 +886,11 @@
"\n"
"您想继续吗?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "非 i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -900,11 +900,11 @@
"您的系统使用的是 i586 或是没有“cmov”扩展的 CPU。所有优化生成的软件包都需要最低 i686 的架构。这样的硬件无法升级到新的 Ubuntu "
"发行版。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "没有 ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -914,11 +914,11 @@
"您的系统使用的是比 ARMv6 架构旧的 ARM CPU。karmic 中所有软件包构建时进行的优化都需要至少 ARMv6 的 CPU "
"架构。在这种硬件基础上无法将您的系统升级到一个新的 Ubuntu 发行版。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "无可用的 init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -932,11 +932,11 @@
"\n"
"您确定要继续吗?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "未启用 PAE 功能"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1628,11 +1628,11 @@
msgid "Downloading the release upgrade tool"
msgstr "正在下载发布升级工具"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "验证是否能够升级到最新版本"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "尝试通过 $distro-proposed 更新到最新版本。"
@@ -1704,20 +1704,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "运行“do-release-upgrade”来升级到新版本。"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "软件更新器"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s 升级可用"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "您已经拒绝升级到 Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "添加调试输出"
diff -Nru ubuntu-release-upgrader-17.04.7/po/zh_HK.po ubuntu-release-upgrader-17.10.1/po/zh_HK.po
--- ubuntu-release-upgrader-17.04.7/po/zh_HK.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/zh_HK.po 2017-04-24 21:05:20.000000000 +0000
@@ -10,12 +10,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: zh_HK\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s伺服器"
@@ -23,30 +23,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "主伺服器"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "自訂伺服器"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "無法推算 sources.list 項目"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "找不到套件檔案;也許這不是 Ubuntu 光碟,又或者處理器架構不對?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "加入光碟失敗"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -60,12 +60,12 @@
"錯誤訊息:\n"
"「%s」"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "移除有問題套件"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -79,22 +79,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "伺服器可能負載過大"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "損毀的套件"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr "系統有一些本軟件無法修正的損毀套件。請先以「Synaptic 套件管理員」或 apt-get 修正再繼續。"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -112,63 +112,63 @@
"* 使用了不是由 Ubuntu 提供的非官方軟件套件\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "這通常只是暫時性的問題。請稍候再試。"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr "非以上所述者,請在終端機使用「ubuntu-bug ubuntu-release-upgrader-core」報告此問題。"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "無法為升級進行推算"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "核證一些套件時發生錯誤"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr "系統無法核證一些套件。這可能是由於短暫的網絡問題;您可以稍後再試。以下為未能核證的套件。"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "套件「%s」標記作移除,但它在移除黑名單中。"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "必備套件「%s」被標記作移除。"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "正在嘗試安裝已列入黑名單的「%s」版本"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "無法安裝「%s」"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr "無法安裝所需套件。請在終端機使用「ubuntu-bug ubuntu-release-upgrader-core」報告此問題。"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "無法估計元套件 (meta-package)"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -440,7 +440,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "正在推算改動"
@@ -460,7 +460,7 @@
msgstr "現在會取消升級,並將系統恢復至原來狀態。之後可以繼續升級。"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "無法下載升級套件"
@@ -472,33 +472,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "提交時發生錯誤"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "回復原有系統狀態"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "無法安裝升級套件"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr "已放棄升級。系統可能會處於不穩定狀態。現在會執行復原程序 (dpkg --configure -a)。"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -514,26 +514,26 @@
"upgrader/+filebug 報告此問題,並將 /var/log/dist-upgrade/ 內的檔案附加在問題報告。\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr "已放棄升級。請檢查您的互聯網連線或安裝媒體,接著再試一次。 "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "是否移除淘汰的套件?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "保留(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "移除(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -541,45 +541,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "必需的相依套件未安裝"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "必需的相依套件「%s」未安裝。 "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "正在檢查套件管理員"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "準備升級失敗"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "準備系統以供升級的動作失敗,所以正在啟動臭蟲報告程序。"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "取得升級先決元件失敗"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -590,7 +590,7 @@
"\n"
"此外還會啟動臭蟲報告程序。"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -599,23 +599,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "更新套件庫資料"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "加入光碟失敗"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "很抱歉,沒有成功加入光碟。"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "套件資訊無效"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -629,40 +629,40 @@
"在更新你的套件資訊之後,找不到必要套件「%s」的位置。這可能因為你沒有在軟件來源列出官方鏡像站,或者是因為你正使用的鏡像站正忙碌超載。請見 "
"/etc/apt/sources.list 以瞭解目前設定的軟件來源列表。"
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "提取中"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "升級中"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "升級完成"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "升級已經完成,但在升級過程中有發生錯誤。"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "正搜尋淘汰的軟件"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "系統升級完成。"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "完成部份升級。"
@@ -691,80 +691,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "以「%(signature)s」核證「%(file)s」 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "正在抽取「%s」"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "無法執行升級工具"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr "這個問題極可能來自升級工具。請使用「ubuntu-bug ubuntu-release-upgrader-core」報告此問題。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "升級工具簽署"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "升級工具"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "提取失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "提取升級套件失敗。可能是網絡問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "未能核證身份"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "未能核證升級套件。可能是因為跟伺服器的網絡連線出現問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "解壓失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "升級套件解壓失敗。可能是因為網絡或伺服器出現問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "驗證失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "驗證升級套件失敗。可能是因為網絡或伺服器出現問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "不能進行升級"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr "這通常是由使用 noexec 掛載 /tmp 的系統引致的。請不要使用 noexec 重新掛載,並再次進行升級。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "錯誤訊息 '%s'。"
@@ -866,11 +866,11 @@
"\n"
"是否要繼續?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "非 i686 處理器"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -880,11 +880,11 @@
"您的系統使用 i586 處理器,或是不支援「cmov」擴充功能的處理器。所有套件都以 i686 架構為最佳化目標來建置,所以處理器至少需要有 i686 "
"等級。對於目前的硬件來說,無法將系統升級到新的 Ubuntu 發行版。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "非 ARMv6 處理器"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -894,11 +894,11 @@
"您系統使用的 ARM 處理器舊於 ARMv6 架構。所有 karmic 套件都以 ARMv6 架構為最佳化目標來建置,所以處理器至少需要有 ARMv6 "
"等級。對於目前的硬件來說,無法將系統升級到新的 Ubuntu 發行版。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "無法初始化"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -912,11 +912,11 @@
"\n"
"您確定想要繼續?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "物理地址擴展(PAE)未啟用"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1608,11 +1608,11 @@
msgid "Downloading the release upgrade tool"
msgstr "正在下載發行版更新工具"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "檢查能否升級至最新測試版"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "嘗試使用 $distro-proposed 的升級程式來升級至最新的發行版本"
@@ -1684,20 +1684,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "執行 ‘do-release-upgrade’ 進行升級工作。"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "軟件更新"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "可以升級至 Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "已拒絕升級至 Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "加入除錯輸出"
diff -Nru ubuntu-release-upgrader-17.04.7/po/zh_TW.po ubuntu-release-upgrader-17.10.1/po/zh_TW.po
--- ubuntu-release-upgrader-17.04.7/po/zh_TW.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/zh_TW.po 2017-04-24 21:05:20.000000000 +0000
@@ -10,12 +10,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: \n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr "%s伺服器"
@@ -23,30 +23,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr "主伺服器"
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr "自訂伺服器"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr "無法推算 sources.list 項目"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "找不到套件檔,也許這不是 Ubuntu 光碟,或者處理器架構不對。"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr "無法加入光碟"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -60,12 +60,12 @@
"錯誤訊息:\n"
"「%s」"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "移除有問題套件"
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -79,22 +79,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr "伺服器可能負載過大"
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "損毀套件"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr "本軟體無法修正閣下系統某有損毀套件。請先使用 synaptic 或 apt-get 修正才繼續。"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -112,63 +112,63 @@
"* 使用了不是由 Ubuntu 提供的非官方軟體套件\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr "很可能只是暫時有問題。請稍候再試。"
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr "非以上所述者,請在終端機使用「ubuntu-bug ubuntu-release-upgrader-core」通報此問題。"
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr "無法推算升級"
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr "核對一些套件時發生錯誤"
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr "無法核對部份套件。可能是因為短時間的網路問題。您可以稍候再試一次。下面是未核對的套件清單。"
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "套件「%s」標記作移除,但它在移除黑名單中。"
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "必要套件「%s」被標記作移除。"
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "正在嘗試安裝已列入黑名單的「%s」版本"
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr "無法安裝「%s」"
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr "無法安裝所需套件。請在終端機使用「ubuntu-bug ubuntu-release-upgrader-core」通報此問題。"
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr "無法估計元套件 (meta-package)"
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -447,7 +447,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr "正在推算所有的更動"
@@ -467,7 +467,7 @@
msgstr "現在將取消升級,並且將系統還原至原來狀態。您可以在之後再進行升級。"
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr "無法下載升級套件"
@@ -479,33 +479,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr "提交時發生錯誤"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr "回復原有系統狀態"
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr "無法安裝升級"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr "已放棄升級。您的系統可能處於不穩定狀態。現在將執行復原程序 (dpkg --configure -a)。"
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -521,26 +521,26 @@
"upgrader/+filebug 通報此問題,並將 /var/log/dist-upgrade/ 內的檔案附加在問題報告上。\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr "已放棄升級。請檢查您的網際網路連線或安裝媒體,接著再試一次。 "
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr "移除廢棄的套件?"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "保留(_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "移除(_R)"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -548,45 +548,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr "必需的相依套件未被安裝"
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "必需的相依套件‘%s’未被安裝。 "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr "正在檢查套件管理員"
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr "準備升級失敗"
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "準備系統以供升級的動作失敗,所以正在啟動臭蟲回報程序。"
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr "未能為系統準備升級。要回報此錯誤,請安裝 apport 並執行「apport-bug ubuntu-release-upgrader」。"
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr "取得升級先決元件失敗"
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -597,7 +597,7 @@
"\n"
"此外,臭蟲回報程序正在啟動中。"
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -609,23 +609,23 @@
"\n"
"要回報此錯誤,請安裝 apport 並執行「apport-bug ubuntu-release-upgrader」。"
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr "正在更新套件庫資訊"
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr "無法加入光碟"
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr "很抱歉,沒有成功加入光碟。"
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr "無效的套件資訊"
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -640,40 +640,40 @@
"/etc/apt/sources.list 以瞭解目前設定的軟體來源列表。\n"
"若鏡像站正處於超載狀態,您可以過一段時間後再試著更新。"
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr "接收中"
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr "升級中"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr "升級完成"
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "升級已經完成,但在升級過程中有發生錯誤。"
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr "搜尋廢棄的軟體中"
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr "系統升級完成。"
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr "部份升級完成。"
@@ -702,80 +702,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "以「%(signature)s」核對「%(file)s」 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr "正在抽出「%s」"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr "無法執行升級工具"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr "這個問題極可能來自升級工具。請使用「ubuntu-bug ubuntu-release-upgrader-core」通報此問題。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr "升級工具簽署"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr "升級工具"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr "接收失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "接收升級套件失敗。可能是網路問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr "身分核對失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "核對升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr "解壓失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "升級套件解壓失敗。可能是因為網路或伺服器出現問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr "檢驗失敗"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "檢驗升級套件失敗。可能是因為網路或伺服器出現問題。 "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr "不能進行升級"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr "這通常是由使用 noexec 掛載 /tmp 的系統引致的。請不要使用 noexec 重新掛載,並再次進行升級。"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr "錯誤訊息 '%s'。"
@@ -877,11 +877,11 @@
"\n"
"是否要繼續?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr "無 i686 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -891,11 +891,11 @@
"您的系統使用 i586 CPU,或是不支援 'cmov' 擴充功能的 CPU。所有套件都以 i686 架構為最佳化目標來建置,所以 CPU 至少需要有 "
"i686 等級。對於您目前的硬體來說,您無法將系統升級到最新的 Ubuntu 發行。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr "無 ARMv6 處理器"
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -905,11 +905,11 @@
"您系統使用的 ARM 處理器舊於 ARMv6 架構。所有 karmic 套件都是以 ARMv6 "
"為最低架構優化建造的。所以伴隨此硬體無法升級您的系統到新的 Ubuntu 版本。"
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr "無法初始化"
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -923,11 +923,11 @@
"\n"
"您確定想要繼續?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr "實體位址延伸功能 (PAE) 尚未啟用"
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1622,11 +1622,11 @@
msgid "Downloading the release upgrade tool"
msgstr "正下載發行版更新工具"
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr "檢查能否升級至最新開發發行版"
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "試著使用 $distro-proposed 的套件升級程式來升級到最新的發行版本"
@@ -1698,20 +1698,22 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "執行 ‘do-release-upgrade’ 進行升級工作。"
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr "軟體更新"
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "可以升級至 Ubuntu %(version)s"
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "已拒絕升級至 Ubuntu %s"
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr "加入除錯輸出"
diff -Nru ubuntu-release-upgrader-17.04.7/po/zu.po ubuntu-release-upgrader-17.10.1/po/zu.po
--- ubuntu-release-upgrader-17.04.7/po/zu.po 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/po/zu.po 2017-04-24 21:05:20.000000000 +0000
@@ -15,12 +15,12 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2016-12-29 04:50+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:28+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
"Language: zu\n"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
+#: ../DistUpgrade/distro.py:215 ../DistUpgrade/distro.py:446
#, python-format
msgid "Server for %s"
msgstr ""
@@ -28,30 +28,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
-#: ../DistUpgrade/distro.py:251
+#: ../DistUpgrade/distro.py:233 ../DistUpgrade/distro.py:239
+#: ../DistUpgrade/distro.py:255
msgid "Main server"
msgstr ""
-#: ../DistUpgrade/distro.py:255
+#: ../DistUpgrade/distro.py:259
msgid "Custom servers"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:149
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:151
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:259
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:260
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:309
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:310
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:311
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -61,13 +61,13 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:173
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:176
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -82,22 +82,22 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:259
+#: ../DistUpgrade/DistUpgradeCache.py:278
msgid "The server may be overloaded"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:372
+#: ../DistUpgrade/DistUpgradeCache.py:391
msgid "Broken packages"
msgstr "Izihuqulo eziphile"
-#: ../DistUpgrade/DistUpgradeCache.py:373
+#: ../DistUpgrade/DistUpgradeCache.py:392
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:644
+#: ../DistUpgrade/DistUpgradeCache.py:663
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -108,63 +108,63 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:654
+#: ../DistUpgrade/DistUpgradeCache.py:673
msgid "This is most likely a transient problem, please try again later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:657
+#: ../DistUpgrade/DistUpgradeCache.py:676
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:662
+#: ../DistUpgrade/DistUpgradeCache.py:681
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:721
+#: ../DistUpgrade/DistUpgradeCache.py:740
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:722
+#: ../DistUpgrade/DistUpgradeCache.py:741
msgid ""
"It was not possible to authenticate some packages. This may be a transient "
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:743
+#: ../DistUpgrade/DistUpgradeCache.py:762
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:768
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:758
+#: ../DistUpgrade/DistUpgradeCache.py:777
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:877
+#: ../DistUpgrade/DistUpgradeCache.py:896
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:878
+#: ../DistUpgrade/DistUpgradeCache.py:897
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug ubuntu-release-upgrader-core' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:889
+#: ../DistUpgrade/DistUpgradeCache.py:908
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:890
+#: ../DistUpgrade/DistUpgradeCache.py:909
#, python-format
msgid ""
"Your system does not contain a %s or %s package and it was not possible to "
@@ -415,7 +415,7 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
#: ../DistUpgrade/DistUpgradeController.py:1016
-#: ../DistUpgrade/DistUpgradeController.py:1828
+#: ../DistUpgrade/DistUpgradeController.py:1832
msgid "Calculating the changes"
msgstr ""
@@ -435,7 +435,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgradeController.py:1128
-#: ../DistUpgrade/DistUpgradeController.py:1253
+#: ../DistUpgrade/DistUpgradeController.py:1257
msgid "Could not download the upgrades"
msgstr ""
@@ -447,33 +447,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1204
-#: ../DistUpgrade/DistUpgradeController.py:1241
-#: ../DistUpgrade/DistUpgradeController.py:1346
+#: ../DistUpgrade/DistUpgradeController.py:1206
+#: ../DistUpgrade/DistUpgradeController.py:1245
+#: ../DistUpgrade/DistUpgradeController.py:1350
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1206
-#: ../DistUpgrade/DistUpgradeController.py:1243
-#: ../DistUpgrade/DistUpgradeController.py:1385
+#: ../DistUpgrade/DistUpgradeController.py:1208
+#: ../DistUpgrade/DistUpgradeController.py:1247
+#: ../DistUpgrade/DistUpgradeController.py:1389
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1207
-#: ../DistUpgrade/DistUpgradeController.py:1222
-#: ../DistUpgrade/DistUpgradeController.py:1244
+#: ../DistUpgrade/DistUpgradeController.py:1209
+#: ../DistUpgrade/DistUpgradeController.py:1224
+#: ../DistUpgrade/DistUpgradeController.py:1248
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1212
+#: ../DistUpgrade/DistUpgradeController.py:1214
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1217
+#: ../DistUpgrade/DistUpgradeController.py:1219
#, python-format
msgid ""
"\n"
@@ -484,26 +484,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1254
+#: ../DistUpgrade/DistUpgradeController.py:1258
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1334
+#: ../DistUpgrade/DistUpgradeController.py:1338
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
#: ../data/gtkbuilder/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Londa"
-#: ../DistUpgrade/DistUpgradeController.py:1335
+#: ../DistUpgrade/DistUpgradeController.py:1339
msgid "_Remove"
msgstr "_Susa"
-#: ../DistUpgrade/DistUpgradeController.py:1347
+#: ../DistUpgrade/DistUpgradeController.py:1351
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -511,45 +511,45 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1423
+#: ../DistUpgrade/DistUpgradeController.py:1427
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1424
+#: ../DistUpgrade/DistUpgradeController.py:1428
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1691
-#: ../DistUpgrade/DistUpgradeController.py:1778
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1782
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1697
-#: ../DistUpgrade/DistUpgradeController.py:1703
+#: ../DistUpgrade/DistUpgradeController.py:1701
+#: ../DistUpgrade/DistUpgradeController.py:1707
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
+#: ../DistUpgrade/DistUpgradeController.py:1708
msgid ""
"Preparing the system for the upgrade failed. To report a bug install apport "
"and then execute 'apport-bug ubuntu-release-upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1721
-#: ../DistUpgrade/DistUpgradeController.py:1731
+#: ../DistUpgrade/DistUpgradeController.py:1725
+#: ../DistUpgrade/DistUpgradeController.py:1735
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1722
+#: ../DistUpgrade/DistUpgradeController.py:1726
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -557,7 +557,7 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1732
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -566,23 +566,23 @@
"upgrader'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1762
+#: ../DistUpgrade/DistUpgradeController.py:1766
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1769
+#: ../DistUpgrade/DistUpgradeController.py:1773
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1770
+#: ../DistUpgrade/DistUpgradeController.py:1774
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1805
+#: ../DistUpgrade/DistUpgradeController.py:1809
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1806
+#: ../DistUpgrade/DistUpgradeController.py:1810
#, python-format
msgid ""
"After updating your package information, the essential package '%s' could "
@@ -594,40 +594,40 @@
"later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1834
-#: ../DistUpgrade/DistUpgradeController.py:1890
+#: ../DistUpgrade/DistUpgradeController.py:1838
+#: ../DistUpgrade/DistUpgradeController.py:1894
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1840
-#: ../DistUpgrade/DistUpgradeController.py:1894
+#: ../DistUpgrade/DistUpgradeController.py:1844
+#: ../DistUpgrade/DistUpgradeController.py:1898
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1845
-#: ../DistUpgrade/DistUpgradeController.py:1896
-#: ../DistUpgrade/DistUpgradeController.py:1903
-#: ../DistUpgrade/DistUpgradeController.py:1914
+#: ../DistUpgrade/DistUpgradeController.py:1849
+#: ../DistUpgrade/DistUpgradeController.py:1900
+#: ../DistUpgrade/DistUpgradeController.py:1907
+#: ../DistUpgrade/DistUpgradeController.py:1918
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1846
-#: ../DistUpgrade/DistUpgradeController.py:1897
-#: ../DistUpgrade/DistUpgradeController.py:1904
+#: ../DistUpgrade/DistUpgradeController.py:1850
+#: ../DistUpgrade/DistUpgradeController.py:1901
+#: ../DistUpgrade/DistUpgradeController.py:1908
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1853
+#: ../DistUpgrade/DistUpgradeController.py:1857
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1866
+#: ../DistUpgrade/DistUpgradeController.py:1870
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1915
+#: ../DistUpgrade/DistUpgradeController.py:1919
msgid "The partial upgrade was completed."
msgstr ""
@@ -656,80 +656,80 @@
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:137
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:97
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:158
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:159
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:118
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:119
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:160
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:120
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug ubuntu-release-upgrader-core'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:237
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:197
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:204
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:278
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:238
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:283
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:243
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:284
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:244
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:289
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:249
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:290
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:250
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:295
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:255
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:296
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:256
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:310
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:316
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:270
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:276
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:311
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:271
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:317
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:277
#, python-format
msgid "The error message is '%s'."
msgstr ""
@@ -823,11 +823,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:270
+#: ../DistUpgrade/DistUpgradeQuirks.py:272
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:271
+#: ../DistUpgrade/DistUpgradeQuirks.py:273
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -835,11 +835,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:308
+#: ../DistUpgrade/DistUpgradeQuirks.py:310
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:309
+#: ../DistUpgrade/DistUpgradeQuirks.py:311
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -847,11 +847,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:329
+#: ../DistUpgrade/DistUpgradeQuirks.py:331
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:330
+#: ../DistUpgrade/DistUpgradeQuirks.py:332
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -861,11 +861,11 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:483
+#: ../DistUpgrade/DistUpgradeQuirks.py:485
msgid "PAE not enabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:484
+#: ../DistUpgrade/DistUpgradeQuirks.py:486
msgid ""
"Your system uses a CPU that does not have PAE enabled. Ubuntu only supports "
"non-PAE systems up to Ubuntu 12.04. To upgrade to a later version of Ubuntu, "
@@ -1540,11 +1540,11 @@
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../do-release-upgrade:81 ../check-new-release-gtk:177
+#: ../do-release-upgrade:81 ../check_new_release_gtk.py:177
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../do-release-upgrade:88 ../check-new-release-gtk:181
+#: ../do-release-upgrade:88 ../check_new_release_gtk.py:181
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
@@ -1612,19 +1612,21 @@
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:85
+#: ../check_new_release_gtk.py:85
msgid "Software Updater"
msgstr ""
-#: ../check-new-release-gtk:113
+#: ../check_new_release_gtk.py:113
+#, python-format
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:144
-#, c-format
+#. print("don't upgrade")
+#: ../check_new_release_gtk.py:144
+#, python-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:186
+#: ../check_new_release_gtk.py:186
msgid "Add debug output"
msgstr ""
diff -Nru ubuntu-release-upgrader-17.04.7/pre-build.sh ubuntu-release-upgrader-17.10.1/pre-build.sh
--- ubuntu-release-upgrader-17.04.7/pre-build.sh 2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/pre-build.sh 2017-04-24 21:09:37.000000000 +0000
@@ -10,7 +10,7 @@
# update demotions
# echo "Running demotions"
-(cd utils && ./demotions.py yakkety zesty > demoted.cfg)
+(cd utils && ./demotions.py zesty artful > demoted.cfg)
# when this gets enabled, make sure to add symlink in DistUpgrade
# echo "Running lts demotions"
#(cd utils && ./demotions.py trusty xenial > demoted.cfg.trusty)
diff -Nru ubuntu-release-upgrader-17.04.7/utils/apt/sources.list ubuntu-release-upgrader-17.10.1/utils/apt/sources.list
--- ubuntu-release-upgrader-17.04.7/utils/apt/sources.list 2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/utils/apt/sources.list 2017-04-24 21:15:07.000000000 +0000
@@ -1 +1 @@
-deb http://archive.ubuntu.com/ubuntu zesty main
+deb http://archive.ubuntu.com/ubuntu artful main
diff -Nru ubuntu-release-upgrader-17.04.7/utils/demoted.cfg ubuntu-release-upgrader-17.10.1/utils/demoted.cfg
--- ubuntu-release-upgrader-17.04.7/utils/demoted.cfg 2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.10.1/utils/demoted.cfg 2017-04-24 21:15:07.000000000 +0000
@@ -1,197 +1,223 @@
-# demoted packages from yakkety to zesty
-account-plugin-tools
-account-plugin-ubuntuone
-antlr
-antlr-doc
-cgmanager
-checkbox-gui
-clang-3.8
-ecj1
-emacs24
-emacs24-bin-common
-emacs24-common
-emacs24-common-non-dfsg
-emacs24-dbg
-emacs24-el
-emacs24-lucid-dbg
-emacs24-nox
-emacs24-nox-dbg
-espeak-data
-euca2ools
-fastjar
-fonts-stix
-g++-5
-gccgo
-gcj-5
-gcj-5-jdk
-gcj-5-jre
-gcj-5-jre-headless
-gconf-service
-gconf-service-backend
-gconf2
-gconf2-common
-gdebi-core
-gir1.2-gconf-2.0
-golang-1.6-race-detector-runtime
-golang-go-dbus-dev
-golang-ubuntu-push-dev
-imagemagick-doc
-installation-guide-powerpc
-libamd2
-libantlr-dev
-libantlr-java
-libbonobo2-0
-libbonobo2-common
-libbonobo2-dev
-libbonoboui2-0
-libbonoboui2-common
-libbonoboui2-dev
-libboost-atomic1.61-dev
-libboost-atomic1.61.0
-libboost-chrono1.61-dev
-libboost-chrono1.61.0
-libboost-date-time1.61-dev
-libboost-date-time1.61.0
-libboost-filesystem1.61.0
-libboost-iostreams1.61.0
-libboost-locale1.61.0
-libboost-log1.61.0
-libboost-program-options1.61-dev
-libboost-random1.61.0
-libboost-regex1.61.0
-libboost-serialization1.61-dev
-libboost-serialization1.61.0
-libboost-system1.61-dev
-libboost-thread1.61-dev
-libboost-thread1.61.0
-libbtf1
-libcamd2
-libccolamd2
-libcholmod3
-libclang-common-3.8-dev
-libclang1-3.8
-libcolamd2
-libcuda1-367
-libcxsparse3
-libespeak-dev
-libespeak1
-libethdev4
-libfuzzer-3.8-dev
-libgconf-2-4
-libgconf2-dev
-libgconf2-doc
-libglew-dbg
-libglew-dev
-libgnome-2-0
-libgnome2-0
-libgnome2-bin
-libgnome2-common
-libgnome2-dbg
-libgnome2-dev
-libgnome2-doc
-libgnomecanvas2-0
-libgnomecanvas2-common
-libgnomecanvas2-dev
-libgnomecanvas2-doc
-libgnomeui-0
-libgnomeui-0-dbg
-libgnomeui-common
-libgnomeui-dev
-libgnomeui-doc
-libgnomevfs2-0
-libgnomevfs2-0-dbg
-libgnomevfs2-common
-libgnomevfs2-dev
-libgo9
-libidl-2-0
-libidl-dev
-libixion-dev
-libjs-jquery-easing
-libjs-jquery-fancybox
-libjs-jquery-mousewheel
-libjs-jquery-resize-doc
-libklu1
-libldl2
-liblldb-3.8
-liblldb-3.8-dbg
-liblldb-3.8-dev
-libllvm3.8
-libllvm3.8-dbg
-liblpsolve55-dev
-liblua5.1-0
-liblua5.1-0-dbg
-liblua5.1-0-dev
-libmdb2
-libmdbsql2
-libmdds-dev
-libmedia-hub-client5
-libmedia-hub-common5
-libmedia-hub-dev
-libmedia-hub-doc
-libmetis-dev
-libmetis-doc
-libmetis5
-libmetis5-dbg
-liborbit-2-0
-liborbit2
-liborbit2-dev
-liborcus-dev
-libpay2
-libpay2-dev
-libportaudio2
-libportaudiocpp0
-librbio2
-librte-cryptodev1
-librte-eal2
-libsasl2-modules-gssapi-heimdal
-libslp-dev
-libslp1
-libspqr2
-libsuitesparse-dev
-libsuitesparse-doc
-libsuitesparseconfig4
-libtspi-dev
-libtspi1
-libubuntuoneauth-2.0-0
-libubuntuoneauth-2.0-dev
-libumfpack5
-libwebkit2gtk-4.0-37-gtk2
-lldb-3.8
-llvm-3.8
-llvm-3.8-dev
-llvm-3.8-doc
-llvm-3.8-examples
-llvm-3.8-runtime
-lp-solve
-lp-solve-doc
-lua5.1-doc
-mdbtools
-mdbtools-dbg
-mdbtools-dev
-mdbtools-doc
-mdbtools-gmdb
-nvidia-opencl-icd-367
-odbc-mdbtools
-openslp-doc
-orbit2
-pay-service
-pay-ui
-portaudio19-dev
-portaudio19-doc
-python-boto
-python-requestbuilder
-python3-tdb
-qml-module-ubuntuone
-qtdeclarative5-test-plugin
-signon-plugin-password
-trousers
-trousers-dbg
-ubuntu-app-launch-tools
-ubuntu-wallpapers-yakkety
-ubuntuone-client-data
-ubuntuone-credentials-common
-unity-scope-click
-xserver-xorg-input-evdev
-xserver-xorg-input-evdev-dbg
-xserver-xorg-input-evdev-dev
-xul-ext-mozvoikko
+# demoted packages from zesty to artful
+accountsservice-ubuntu-schemas
+accountsservice-ubuntu-touch-schemas
+address-book-service
+biometryd-bin
+connectivity-doc
+content-hub
+dbus-cpp-dev-examples
+evolution-data-server-utouch
+evolution-data-server-utouch-dev
+folks-common
+gir1.2-farstream-0.2
+gir1.2-folks-0.6
+gir1.2-gssdp-1.0
+gir1.2-gupnp-1.0
+gir1.2-gupnpigd-1.0
+gir1.2-nice-0.1
+gstreamer1.0-nice
+history-service
+indicator-network
+indicator-transfer
+indicator-transfer-download-manager
+libbiometryd-dev
+libbiometryd1
+libboost-program-options1.61.0
+libboost-system1.61.0
+libboost1.61-dbg
+libboost1.61-dev
+libboost1.61-doc
+libboost1.61-tools-dev
+libcgmanager-dev
+libcgmanager0
+libconnectivity-qt1
+libconnectivity-qt1-dev
+libdbus-cpp-dev
+libdbus-cpp5
+libfarstream-0.2-5
+libfarstream-0.2-dev
+libfarstream-0.2-doc
+libfolks-dev
+libfolks-dummy-dev
+libfolks-dummy25
+libfolks-eds-dev
+libfolks-eds25
+libfolks-telepathy-dev
+libfolks-telepathy25
+libfolks25
+libgssdp-1.0-3
+libgssdp-1.0-dev
+libgssdp-doc
+libgupnp-1.0-4
+libgupnp-1.0-dev
+libgupnp-doc
+libgupnp-igd-1.0-4
+libgupnp-igd-1.0-dbg
+libgupnp-igd-1.0-dev
+libgupnp-igd-1.0-doc
+libhistoryservice-dev
+libhistoryservice0
+libindicator-transfer-dev
+libindicator-transfer0
+libmediascanner-2.0-4
+libmediascanner-2.0-dev
+libmiral-dev
+libmiral2
+libmirclientcpp-dev
+libmission-control-plugins-dev
+libmission-control-plugins-doc
+libmission-control-plugins0
+libnet-cpp-dev
+libnet-cpp-doc
+libnet-cpp2
+libnice-dbg
+libnice-dev
+libnice-doc
+libnice10
+libonline-accounts-client-dev
+libonline-accounts-client1
+libonline-accounts-daemon-dev
+libonline-accounts-daemon1
+libonline-accounts-plugin-dev
+libonline-accounts-qt-dev
+libonline-accounts-qt1
+libplatform-api1-dev
+libplatform-api1-doc
+libplatform-hardware-api1-dev
+libprocess-cpp-dev
+libprocess-cpp-doc
+libprocess-cpp3
+libqdjango-db0
+libqdjango-dbg
+libqdjango-dev
+libqdjango-doc
+libqdjango-http0
+libqmenumodel-dev
+libqmenumodel0
+libqofono-dev
+libqofono-qt5-0
+libqt5sensors5
+libqt5sensors5-dev
+libscope-harness-dev
+libscope-harness3
+libsodium-dbg
+libsodium-dev
+libsodium18
+libsystemsettings-dev
+libsystemsettings1
+libtelepathy-farstream-dev
+libtelepathy-farstream-doc
+libtelepathy-farstream3
+libtelepathy-farstream3-dbg
+libtelepathy-qt4-2
+libtelepathy-qt4-dbg
+libtelepathy-qt4-dev
+libtelepathy-qt4-doc
+libtelepathy-qt4-farstream2
+libtelepathy-qt5-0
+libtelepathy-qt5-dbg
+libtelepathy-qt5-dev
+libtelepathy-qt5-farstream0
+libthumbnailer-qt-dev
+libthumbnailer-qt-doc
+libthumbnailer-qt1.0
+libtrust-store-dev
+libtrust-store-doc
+libtrust-store2
+libubuntu-application-api-dev
+libubuntu-application-api-doc
+libubuntu-application-api-headers
+libubuntu-application-api3
+libubuntu-location-service-dbg
+libubuntu-location-service-dev
+libubuntu-location-service3
+libubuntu-platform-hardware-api-dev
+libubuntu-platform-hardware-api-headers
+libubuntu-platform-hardware-api3
+libunity-api-dev
+libunity-api-doc
+libunity-api0
+libunity-scopes-dev
+libunity-scopes-doc
+libunity-scopes-qt-dev
+libunity-scopes-qt-doc
+libunity-scopes-qt0.2
+libunity-scopes1.0
+libupstart-dev
+libupstart1
+libusermetrics-doc
+libusermetricsinput1
+libusermetricsinput1-dev
+libusermetricsoutput1
+libusermetricsoutput1-dev
+libzmq3-dev
+libzmq5
+libzmq5-dbg
+libzmqpp-dev
+libzmqpp4
+mediascanner2.0
+mir-client-platform-mesa5
+mir-graphics-drivers-desktop
+mir-platform-graphics-mesa-kms12
+mir-platform-graphics-mesa-x12
+mir-platform-input-evdev6
+miral-doc
+miral-examples
+policykit-unity8
+qmenumodel-qml
+qml-module-biometryd
+qml-module-ofono
+qml-module-pamauthentication0.1
+qml-module-qmltermwidget1.0
+qml-module-qtqml-statemachine
+qml-module-ubuntu-connectivity
+qml-module-ubuntu-onlineaccounts-client
+qml-module-ubuntu-onlineaccounts-client-doc
+qml-module-ubuntu-onlineaccounts2
+qml-module-ubuntu-onlineaccounts2-doc
+qml-module-ubuntu-settings-components
+qml-module-ubuntu-thumbnailer0.1
+qtcontact5-galera
+qtdeclarative5-gsettings1.0
+qtdeclarative5-qtmir-plugin
+qtdeclarative5-ubuntu-settings-components
+qtdeclarative5-ubuntu-telephony0.1
+qtdeclarative5-unity-notifications-plugin
+qtmir-desktop
+qtsensors5-doc
+qtsensors5-examples
+qtubuntu-appmenutheme
+qtubuntu-desktop
+qtubuntu-print
+repowerd
+repowerd-data
+telepathy-mission-control-5
+telepathy-mission-control-5-dbg
+telephony-service
+thumbnailer-service
+tone-generator
+tone-generator-dbg
+ubuntu-application-api3-desktop
+ubuntu-application-api3-examples
+ubuntu-application-api3-test
+ubuntu-application-api3-touch
+ubuntu-keyboard-data
+ubuntu-keyboard-dev
+ubuntu-location-service-doc
+ubuntu-location-service-examples
+ubuntu-printing-app
+ubuntu-system-settings
+ubuntu-terminal-app
+unity-greeter-session-broadcast
+unity-plugin-scopes
+unity-scope-mediascanner2
+unity-system-compositor
+unity8
+unity8-common
+unity8-desktop-session
+unity8-doc
+unity8-private
+upstart-monitor
+url-dispatcher
+url-dispatcher-tools
+usermetricsservice