Merge lp:~jbicha/software-properties/use-gi-require_version into lp:software-properties

[Jeremy Bicha]

[lp:~jbicha/software-properties/use-gi-require_version]

972. By Dimitri John Ledkov on 2016-09-01

add-apt-repository: fix compatibility with keybox gnupg 2.1. LP:
#1615039

973. By Dimitri John Ledkov on 2016-09-01

releasing package software-properties version 0.96.24.4

[Jeremy Bicha (jbicha)]

I also added patches 2, 3, and 6 from
https://anonscm.debian.org/git/collab-maint/software-properties.git/tree/debian/patches

I'd like to merge patch 4 (Use PackageKit directly instead of aptdaemon) too but Matthias (ximion) said the software driver support wasn't thoroughly tested yet, so I guess we'll wait for the 17.04 cycle to do that one.

[Jeremy Bicha (jbicha)]

Because it looked like this might not get approved before UI Freeze, I went ahead and used ubuntu-gnome-default-settings to hide "Additional Drivers" in GNOME. We can then drop that hack when this is merged without breaking the UI Freeze.

[lp:~jbicha/software-properties/use-gi-require_version]

974. By Dimitri John Ledkov on 2016-09-08

software-properties-common: add depends on dirmngr, such that
add-apt-repository can fetch keys for PPAs.

975. By Dimitri John Ledkov on 2016-09-08

releasing package software-properties version 0.96.24.5

976. By Jeremy Bicha on 2016-09-09

Add gi.require_version("Gtk", "3.0") to silence the warning

979. By Jeremy Bicha on 2016-09-09

Rebuild software-properties.pot

./setup.py build_i18n

=== modified file 'data/software-properties-drivers.desktop.in'
--- data/software-properties-drivers.desktop.in	2014-04-04 06:52:18 +0000
+++ data/software-properties-drivers.desktop.in	2016-09-09 07:14:41 +0000
@@ -4,8 +4,9 @@
 Icon=jockey
 Terminal=false
 Type=Application
-NotShownIn=GNOME;Unity;KDE;
+NotShowIn=GNOME;KDE;
 Categories=X-XFCE;GTK;Settings;HardwareSettings
+X-AppStream-Ignore=true
 Name=Additional Drivers
 Name[es]=Controladores adicionales
 Comment=Configure third-party and proprietary drivers

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-08 09:54:13 +0000
+++ debian/changelog	2016-09-09 07:14:41 +0000
@@ -1,3 +1,15 @@
+software-properties (0.96.24.6) UNRELEASED; urgency=medium
+
+  [ Jeremy Bicha ]
+  * Add gi.require_version("Gtk", "3.0") to silence the warning
+
+  [ Matthias Klumpp ]
+  * Drop po/urd.po; it's a duplicate of po/ur.po
+  * Fix typo in Additional Drivers .desktop preventing the .desktop from
+    being hidden in GNOME and KDE. Also have AppStream ignore it.
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 09 Sep 2016 03:08:01 -0400
+
 software-properties (0.96.24.5) yakkety; urgency=medium
 
   * software-properties-common: add depends on dirmngr, such that

=== modified file 'po/software-properties.pot'
--- po/software-properties.pot	2014-09-11 14:02:47 +0000
+++ po/software-properties.pot	2016-09-09 07:14:41 +0000
@@ -8,13 +8,13 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Sebastian Heinlein <[e-mail]>\n"
-"POT-Creation-Date: 2014-09-11 11:45+0200\n"
+"POT-Creation-Date: 2016-09-09 03:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
@@ -41,8 +41,8 @@
 msgstr ""
 
 #: ../data/software-properties-kde.desktop.in.h:1
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:653
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:672
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:674
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:693
 msgid "Software Sources"
 msgstr ""
 
@@ -53,10 +53,39 @@
 "'add-apt-repository multiverse'"
 msgstr ""
 
-#: ../add-apt-repository:59
+#: ../software-properties-kde:75
+msgid "Print some debug information to the command line"
+msgstr ""
+
+#: ../software-properties-kde:78 ../add-apt-repository:59
 msgid "Print a lot of debug information to the command line"
 msgstr ""
 
+#: ../software-properties-kde:81
+msgid ""
+"No update on repository change (useful if called from an external program)"
+msgstr ""
+
+#: ../software-properties-kde:84
+msgid "Enable the specified component of the distro's repositories"
+msgstr ""
+
+#: ../software-properties-kde:88
+msgid "Enable PPA with the given name"
+msgstr ""
+
+#: ../software-properties-kde:92
+msgid "URL of keyserver"
+msgstr ""
+
+#: ../software-properties-kde:95
+msgid "Win ID to act as a dialogue for"
+msgstr ""
+
+#: ../software-properties-kde:98
+msgid "data directory for UI files"
+msgstr ""
+
 #: ../add-apt-repository:62
 msgid "remove repository from sources.list.d directory"
 msgstr ""
@@ -74,57 +103,61 @@
 msgid "Assume yes to all queries"
 msgstr ""
 
-#: ../add-apt-repository:75
+#: ../add-apt-repository:74
+msgid "Update package cache after adding"
+msgstr ""
+
+#: ../add-apt-repository:78
 msgid "Error: must run as root"
 msgstr ""
 
-#: ../add-apt-repository:79
+#: ../add-apt-repository:82
 msgid "Error: need a repository as argument"
 msgstr ""
 
-#: ../add-apt-repository:82
+#: ../add-apt-repository:85
 msgid "Error: need a single repository as argument"
 msgstr ""
 
-#: ../add-apt-repository:102
+#: ../add-apt-repository:105
 #, c-format
 msgid "'%s' distribution component disabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:104
+#: ../add-apt-repository:107
 #, c-format
 msgid "'%s' distribution component is already disabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:109
+#: ../add-apt-repository:112
 #, c-format
 msgid "'%s' distribution component enabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:111
+#: ../add-apt-repository:114
 #, c-format
 msgid "'%s' distribution component is already enabled for all sources."
 msgstr ""
 
-#: ../add-apt-repository:133
+#: ../add-apt-repository:136
 #, c-format
 msgid " More info: %s"
 msgstr ""
 
-#: ../add-apt-repository:137
+#: ../add-apt-repository:140
 msgid "Press [ENTER] to continue or ctrl-c to cancel removing it"
 msgstr ""
 
-#: ../add-apt-repository:139
+#: ../add-apt-repository:142
 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it"
 msgstr ""
 
-#: ../add-apt-repository:156 ../add-apt-repository:160
+#: ../add-apt-repository:160 ../add-apt-repository:164
 #, c-format
 msgid "Error: '%s' doesn't exist in a sourcelist file"
 msgstr ""
 
-#: ../add-apt-repository:165
+#: ../add-apt-repository:169
 #, c-format
 msgid "Error: '%s' invalid"
 msgstr ""
@@ -156,71 +189,71 @@
 "distribution project."
 msgstr ""
 
-#: ../softwareproperties/kde/DialogMirror.py:57
+#: ../softwareproperties/kde/DialogMirror.py:63
 msgid "Mirror"
 msgstr ""
 
-#: ../softwareproperties/kde/DialogMirror.py:179
-#: ../softwareproperties/kde/DialogMirror.py:180
-#: ../softwareproperties/kde/DialogMirror.py:213
+#: ../softwareproperties/kde/DialogMirror.py:184
+#: ../softwareproperties/kde/DialogMirror.py:185
+#: ../softwareproperties/kde/DialogMirror.py:218
 msgid "Testing Mirrors"
 msgstr ""
 
-#: ../softwareproperties/kde/DialogMirror.py:179
-#: ../softwareproperties/kde/DialogMirror.py:182
+#: ../softwareproperties/kde/DialogMirror.py:184
+#: ../softwareproperties/kde/DialogMirror.py:187
 msgid "Cancel"
 msgstr ""
 
-#: ../softwareproperties/kde/DialogMirror.py:214
-#: ../softwareproperties/gtk/DialogMirror.py:332
+#: ../softwareproperties/kde/DialogMirror.py:219
+#: ../softwareproperties/gtk/DialogMirror.py:337
 msgid "No suitable download server was found"
 msgstr ""
 
-#: ../softwareproperties/kde/DialogMirror.py:215
-#: ../softwareproperties/gtk/DialogMirror.py:333
+#: ../softwareproperties/kde/DialogMirror.py:220
+#: ../softwareproperties/gtk/DialogMirror.py:338
 msgid "Please check your Internet connection."
 msgstr ""
 
-#: ../softwareproperties/kde/DialogMirror.py:230
-#: ../softwareproperties/gtk/DialogMirror.py:348
+#: ../softwareproperties/kde/DialogMirror.py:235
+#: ../softwareproperties/gtk/DialogMirror.py:353
 msgid "Canceling..."
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:164
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:162
 #: ../data/gtkbuilder/main.ui.h:9
 msgid "Daily"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:163
 #: ../data/gtkbuilder/main.ui.h:10
 msgid "Every two days"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:166
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:164
 #: ../data/gtkbuilder/main.ui.h:11
 msgid "Weekly"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:167
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
 #: ../data/gtkbuilder/main.ui.h:12
 msgid "Every two weeks"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:174
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:241
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:172
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:247
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:216
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:214
 #, python-format
 msgid "%s updates"
 msgstr ""
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:220
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:301
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:218
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:307
 #, python-format
 msgid "%s Software"
 msgstr ""
@@ -228,70 +261,64 @@
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:239
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:314
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:237
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:320
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
 #. add a separator and the option to choose another mirror from the list
 #. #FIXME server_store.append(["sep", None, True])
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:302
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:429
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:522
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:300
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:450
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:543
 msgid "Other..."
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:672
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:942
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:668
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:966
 msgid "Import key"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:675
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:956
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:671
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:980
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:676
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:957
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:672
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:981
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:688
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:973
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:685
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:997
 msgid "Error removing the key"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:689
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:974
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:686
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:998
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:703
+msgid "Reload"
+msgstr ""
+
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:705
-msgid "Reload"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:707
-#: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:2
-msgid ""
-"<b><big>The information about available software is out-of-date</big></b>\n"
-"\n"
-"To install software and updates from newly added or changed sources, you "
-"have to reload the information about available software.\n"
-"\n"
-"You need a working internet connection to continue."
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:736
+msgid "Your local copy of the software catalog is out of date."
+msgstr ""
+
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:706
+msgid "A new copy will be downloaded."
+msgstr ""
+
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:730
 msgid "CD Error"
 msgstr ""
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:737
-#, python-format
-msgid ""
-"<big><b>Error scanning the CD</b></big>\n"
-"\n"
-"%s"
+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:731
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:832
+msgid "Error scanning the CD"
 msgstr ""
 
 #: ../softwareproperties/kde/CdromProgress.py:54
@@ -299,7 +326,7 @@
 msgstr ""
 
 #: ../softwareproperties/kde/CdromProgress.py:54
-#: ../softwareproperties/gtk/CdromProgress.py:59
+#: ../softwareproperties/gtk/CdromProgress.py:61
 msgid "Please enter a name for the disc"
 msgstr ""
 
@@ -308,25 +335,19 @@
 msgstr ""
 
 #: ../softwareproperties/kde/CdromProgress.py:58
-#: ../softwareproperties/gtk/CdromProgress.py:75
+#: ../softwareproperties/gtk/CdromProgress.py:77
 msgid "Please insert a disk in the drive:"
 msgstr ""
 
 #. L10N: the example is of the format: deb http://ftp.debian.org sarge main
 #: ../softwareproperties/kde/DialogAdd.py:55
-#: ../data/gtkbuilder/dialog-add.ui.h:1
-msgid ""
-"<big><b>Enter the complete APT line of the repository that you want to add "
-"as source</b></big>"
+msgid "Enter the complete APT line of the repository that you want to add."
 msgstr ""
 
-#. L10N: the example is of the format: deb http://ftp.debian.org sarge main
 #: ../softwareproperties/kde/DialogAdd.py:57
-#: ../softwareproperties/gtk/DialogAdd.py:62
 #, python-format
 msgid ""
-"The APT line includes the type, location and components of a repository, for "
-"example  '%s'."
+"Include the type, location and components of the repository. Example: %s"
 msgstr ""
 
 #: ../softwareproperties/kde/DialogEdit.py:43
@@ -347,175 +368,179 @@
 msgid "Source Code"
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogMirror.py:248
+#: ../softwareproperties/gtk/DialogMirror.py:250
 msgid "New mirror"
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogMirror.py:321
+#: ../softwareproperties/gtk/DialogMirror.py:326
 #, python-format
 msgid "Completed %s of %s tests"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:663
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:682
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:684
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:703
 msgid "Active"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:721
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:742
 msgid "Key"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:738
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:759
 msgid "_Add key from paste data"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:751
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:762
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:772
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:783
 msgid "Error importing key"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:752
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:763
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:773
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:784
 msgid "The selected data may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:808
-msgid "Error scanning the CD"
-msgstr ""
-
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:809
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:833
 msgid "Could not find a suitable CD."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1019
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1043
 msgid "Applying changes..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1100
-#: ../data/gtkbuilder/main.ui.h:40
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1124
+#: ../data/gtkbuilder/main.ui.h:42
 msgid "Re_vert"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1102
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1126
 msgid "_Apply Changes"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1104
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1128
 msgid "_Cancel"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1106
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1130
 msgid "_Restart..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1121
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1145
 msgid "Searching for available drivers..."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1151
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1175
 msgid "An error occurred while searching for drivers."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1223
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1249
 msgid "This device is using the recommended driver."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1224
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1250
 msgid "This device is using an alternative driver."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1225
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1251
 msgid "This device is using a manually-installed driver."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1226
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1252
 msgid "This device is not working."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1235
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1261
 msgid "Continue using a manually installed driver"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1262
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1288
 msgid "Using {} from {}"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1264
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1290
 msgid "Using {}"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1271
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1297
 msgid "open source"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1273
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1299
 msgid "proprietary"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1276
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1302
 #, python-brace-format
 msgid "{base_description} ({licence}, tested)"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1278
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1304
 #, python-brace-format
 msgid "{base_description} ({licence})"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1298
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1324
 msgid "Do not use the device"
 msgstr ""
 
 #. No drivers found.
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1318
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1344
 msgid "No additional drivers available."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1336
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1362
 msgid "Unknown"
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1385
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1411
 msgid "You need to restart the computer to complete the driver changes."
 msgstr ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1399
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1425
 #, python-format
 msgid "%(count)d proprietary driver in use."
 msgid_plural "%(count)d proprietary drivers in use."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1404
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1430
 #: ../data/gtkbuilder/main.ui.h:37
 msgid "No proprietary drivers are in use."
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:43
+#: ../softwareproperties/gtk/DialogAddSourcesList.py:46
 msgid "Add Software Channels"
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:84
+#: ../softwareproperties/gtk/DialogAddSourcesList.py:87
 msgid "Install software additionally or only from this source?"
 msgid_plural "Install software additionally or only from these sources?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:89
+#: ../softwareproperties/gtk/DialogAddSourcesList.py:92
 msgid ""
 "You can either add the following sources or replace your current sources by "
 "them. Only install software from trusted sources."
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:104
+#: ../softwareproperties/gtk/DialogAddSourcesList.py:107
 msgid "There are no sources to install software from"
 msgstr ""
 
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:105
+#: ../softwareproperties/gtk/DialogAddSourcesList.py:108
 #, python-format
 msgid "The file '%s' does not contain any valid software sources."
 msgstr ""
 
+#. L10N: the example is of the format: deb http://ftp.debian.org sarge main
+#: ../softwareproperties/gtk/DialogAdd.py:64
+#, python-format
+msgid ""
+"The APT line includes the type, location and components of a repository, for "
+"example  '%s'."
+msgstr ""
+
 #. some known keys
 #: ../softwareproperties/AptAuth.py:39
 msgid "Ubuntu Archive Automatic Signing Key <[e-mail]>"
@@ -525,6 +550,18 @@
 msgid "Ubuntu CD Image Automatic Signing Key <[e-mail]>"
 msgstr ""
 
+#: ../softwareproperties/AptAuth.py:41
+msgid "Ubuntu Archive Automatic Signing Key (2012) <[e-mail]>"
+msgstr ""
+
+#: ../softwareproperties/AptAuth.py:42
+msgid "Ubuntu CD Image Automatic Signing Key (2012) <[e-mail]>"
+msgstr ""
+
+#: ../softwareproperties/AptAuth.py:43
+msgid "Ubuntu Extras Archive Automatic Signing Key <[e-mail]>"
+msgstr ""
+
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:2
 msgid "Source"
 msgstr ""
@@ -694,11 +731,31 @@
 msgid "Additional Drivers"
 msgstr ""
 
+#: ../data/gtkbuilder/main.ui.h:40
+msgid ""
+"Use proposed updates if you’re willing to report bugs on any problems that "
+"occur."
+msgstr ""
+
+#: ../data/gtkbuilder/main.ui.h:41
+msgid "Developer Options"
+msgstr ""
+
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1
 #: ../data/gtkbuilder/dialog-mirror.ui.h:6
 msgid " "
 msgstr ""
 
+#: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:2
+msgid ""
+"<b><big>The information about available software is out-of-date</big></b>\n"
+"\n"
+"To install software and updates from newly added or changed sources, you "
+"have to reload the information about available software.\n"
+"\n"
+"You need a working internet connection to continue."
+msgstr ""
+
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:7
 msgid "_Reload"
 msgstr ""
@@ -731,6 +788,12 @@
 "location."
 msgstr ""
 
+#: ../data/gtkbuilder/dialog-add.ui.h:1
+msgid ""
+"<big><b>Enter the complete APT line of the repository that you want to add "
+"as source</b></big>"
+msgstr ""
+
 #: ../data/gtkbuilder/dialog-add.ui.h:2
 msgid "APT line:"
 msgstr ""

=== removed file 'po/urd.po'
--- po/urd.po	2009-08-28 17:57:47 +0000
+++ po/urd.po	1970-01-01 00:00:00 +0000
@@ -1,552 +0,0 @@
-# Urdu translation for update-manager
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-28 12:48-0400\n"
-"PO-Revision-Date: 2006-05-07 01:53+0000\n"
-"Last-Translator: Hameed محمد حمید <[e-mail]>\n"
-"Language-Team: Urdu <[e-mail]>\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"
-
-#: ../data/software-properties.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
-msgstr ""
-
-#: ../data/software-properties.desktop.in.h:2
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:549
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:569
-#: ../data/glade/main.glade.h:24
-msgid "Software Sources"
-msgstr ""
-
-#: ../software-properties-gtk:82
-msgid "You need to be root to run this program"
-msgstr ""
-
-#: ../add-apt-repository:18
-msgid "Error: must run as root"
-msgstr ""
-
-#: ../add-apt-repository:22
-msgid "Error: need a repository as argument"
-msgstr ""
-
-#: ../add-apt-repository:31
-#, c-format
-msgid "Error: '%s' invalid"
-msgstr ""
-
-#: ../softwareproperties/distro.py:28
-msgid ""
-"<i>To improve the user experience of Ubuntu please take part in the "
-"popularity contest. If you do so the list of installed software and how "
-"often it was used will be collected and sent anonymously to the Ubuntu "
-"project on a weekly basis.\n"
-"\n"
-"The results are used to improve the support for popular applications and to "
-"rank applications in the search results.</i>"
-msgstr ""
-
-#: ../softwareproperties/distro.py:37
-msgid ""
-"<i>To improve the user experiece of Debian please take part in the "
-"popularity contest. If you do so the list of installed software and how "
-"often it was used will be collected and sent anonymously to the Debian "
-"project.\n"
-"\n"
-"The results are used to optimise the layout of the installation CDs."
-msgstr ""
-
-#: ../softwareproperties/distro.py:44
-msgid ""
-"Submit the list of installed software and how often it is is used to the "
-"distribution project."
-msgstr ""
-
-#: ../softwareproperties/kde/DialogMirror.py:68
-msgid "Mirror"
-msgstr ""
-
-#: ../softwareproperties/kde/DialogMirror.py:214
-#: ../softwareproperties/kde/DialogMirror.py:215
-msgid "Testing Mirrors"
-msgstr ""
-
-#: ../softwareproperties/kde/DialogMirror.py:214
-#: ../softwareproperties/kde/DialogMirror.py:217
-msgid "Cancel"
-msgstr ""
-
-#. update_days = apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autoupdate"])
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:193
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:175
-msgid "Daily"
-msgstr "روز"
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:194
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:176
-msgid "Every two days"
-msgstr "ھر دو دن"
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:195
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:177
-msgid "Weekly"
-msgstr "ھفتھ وار"
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:196
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:178
-msgid "Every two weeks"
-msgstr "ھر دو ھفتے"
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:203
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:187
-#, python-format
-msgid "Every %s days"
-msgstr "ھر %s دن"
-
-#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:245
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:255
-#, python-format
-msgid "%s updates"
-msgstr ""
-
-#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:249
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:258
-#, python-format
-msgid "%s Software"
-msgstr ""
-
-#. TRANSLATORS: Label for the components in the Internet section
-#. first %s is the description of the component
-#. second %s is the code name of the comp, eg main, universe
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:269
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:272
-#, python-format
-msgid "%s (%s)"
-msgstr ""
-
-#. add a separator and the option to choose another mirror from the list
-#. #FIXME server_store.append(["sep", None, True])
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:322
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:427
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:384
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:441
-msgid "Other..."
-msgstr ""
-
-#. L10N: the example is of the format: deb http://ftp.debian.org sarge main
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:653
-#, python-format
-msgid ""
-"<p><b>Enter the complete APT line of the<br /> repository that you want to "
-"add as source</b></p><p>The APT line includes the type, location and "
-"components of a repository,<br /> for example <i>\"%s\"</i>.</p>"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:654
-msgid "Add APT repository"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:695
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:807
-#, fuzzy
-msgid "Import key"
-msgstr "امپورٹ کی"
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:698
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:820
-#: ../softwareproperties/gtk/DialogAptKey.py:88
-msgid "Error importing selected file"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:699
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:821
-#: ../softwareproperties/gtk/DialogAptKey.py:89
-msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:713
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:834
-#: ../softwareproperties/gtk/DialogAptKey.py:101
-msgid "Error removing the key"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:714
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:835
-#: ../softwareproperties/gtk/DialogAptKey.py:102
-msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:730
-msgid "Reload"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:732
-#: ../data/glade/dialogs.glade.h:4
-msgid ""
-"<b><big>The information about available software is out-of-date</big></b>\n"
-"\n"
-"To install software and updates from newly added or changed sources, you "
-"have to reload the information about available software.\n"
-"\n"
-"You need a working internet connection to continue."
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:762
-msgid "CD Error"
-msgstr ""
-
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:763
-#, python-format
-msgid ""
-"<big><b>Error scanning the CD</b></big>\n"
-"\n"
-"%s"
-msgstr ""
-
-#: ../softwareproperties/kde/CdromProgress.py:51
-msgid "CD Name"
-msgstr ""
-
-#: ../softwareproperties/kde/CdromProgress.py:51
-#: ../softwareproperties/gtk/CdromProgress.py:58
-msgid "Please enter a name for the disc"
-msgstr ""
-
-#: ../softwareproperties/kde/CdromProgress.py:55
-msgid "Insert Disk"
-msgstr ""
-
-#: ../softwareproperties/kde/CdromProgress.py:55
-#: ../softwareproperties/gtk/CdromProgress.py:74
-msgid "Please insert a disk in the drive:"
-msgstr ""
-
-#: ../softwareproperties/kde/DialogEdit.py:40
-msgid "Binary"
-msgstr ""
-
-#: ../softwareproperties/kde/DialogEdit.py:41 ../data/glade/main.glade.h:25
-msgid "Source code"
-msgstr ""
-
-#: ../softwareproperties/SoftwareProperties.py:446
-msgid "(Source Code)"
-msgstr ""
-
-#: ../softwareproperties/SoftwareProperties.py:452
-msgid "Source Code"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogMirror.py:244
-msgid "New mirror"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogMirror.py:302
-#, python-format
-msgid "Completed %s of %s tests"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogMirror.py:355
-msgid "No suitable download server was found"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogMirror.py:356
-msgid "Please check your Internet connection."
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogMirror.py:372
-msgid "Canceling..."
-msgstr ""
-
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:560
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:580
-msgid "Active"
-msgstr ""
-
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:631
-msgid "_Add key from paste data"
-msgstr ""
-
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:644
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:655
-#, fuzzy
-msgid "Error importing key"
-msgstr "امپورٹ کی"
-
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:645
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:656
-msgid "The selected data may not be a GPG key file or it might be corrupt."
-msgstr ""
-
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:875
-msgid "Error scanning the CD"
-msgstr ""
-
-#. some known keys
-#: ../softwareproperties/gtk/DialogAptKey.py:37
-#: ../softwareproperties/AptAuth.py:33
-msgid "Ubuntu Archive Automatic Signing Key <[e-mail]>"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogAptKey.py:38
-#: ../softwareproperties/AptAuth.py:34
-msgid "Ubuntu CD Image Automatic Signing Key <[e-mail]>"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogAptKey.py:78
-msgid "Choose a key-file"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:39
-msgid "Add Software Channels"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:80
-msgid "Install software additionally or only from this source?"
-msgid_plural "Install software additionally or only from these sources?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:85
-msgid ""
-"You can either add the following sources or replace your current sources by "
-"them. Only install software from trusted sources."
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:100
-msgid "There are no sources to install software from"
-msgstr ""
-
-#: ../softwareproperties/gtk/DialogAddSourcesList.py:101
-#, python-format
-msgid "The file '%s' does not contain any valid software sources."
-msgstr ""
-
-#. L10N: the example is of the format: deb http://ftp.debian.org sarge main
-#: ../softwareproperties/gtk/DialogAdd.py:60
-#, python-format
-msgid ""
-"The APT line includes the type, location and components of a repository, for "
-"example  '%s'."
-msgstr ""
-
-#: ../data/glade/main.glade.h:1
-msgid "    "
-msgstr ""
-
-#: ../data/glade/main.glade.h:2
-msgid "<b>Automatic updates</b>"
-msgstr ""
-
-#: ../data/glade/main.glade.h:3
-msgid "<b>Downloadable from the Internet</b>"
-msgstr ""
-
-#: ../data/glade/main.glade.h:4
-msgid "<b>Installable from CD-ROM/DVD</b>"
-msgstr ""
-
-#: ../data/glade/main.glade.h:5
-msgid "<b>Release upgrade</b>"
-msgstr ""
-
-#: ../data/glade/main.glade.h:6
-msgid "<b>Trusted software providers</b>"
-msgstr ""
-
-#: ../data/glade/main.glade.h:7
-msgid "Add CD-ROM..."
-msgstr ""
-
-#: ../data/glade/main.glade.h:8
-msgid "Add..."
-msgstr ""
-
-#: ../data/glade/main.glade.h:9
-msgid "Authentication"
-msgstr ""
-
-#: ../data/glade/main.glade.h:10
-msgid "Chec_k for updates:"
-msgstr ""
-
-#: ../data/glade/main.glade.h:11
-msgid "Download from:"
-msgstr ""
-
-#: ../data/glade/main.glade.h:12
-msgid "Edit..."
-msgstr ""
-
-#: ../data/glade/main.glade.h:13
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/glade/main.glade.h:14
-msgid "Install _security updates without confirmation"
-msgstr ""
-
-#: ../data/glade/main.glade.h:15
-msgid ""
-"Keys are used to authenticate the correct source of software and so protect "
-"your computer from malicious software"
-msgstr ""
-
-#: ../data/glade/main.glade.h:16
-msgid ""
-"Never\n"
-"Normal releases\n"
-"Long term support releases only"
-msgstr ""
-
-#: ../data/glade/main.glade.h:19
-msgid "Only _notify about available updates"
-msgstr ""
-
-#: ../data/glade/main.glade.h:20
-msgid "Other Software"
-msgstr ""
-
-#: ../data/glade/main.glade.h:21
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/glade/main.glade.h:22
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/glade/main.glade.h:23
-msgid "Show new distribution releases: "
-msgstr ""
-
-#: ../data/glade/main.glade.h:26
-msgid "Statistics"
-msgstr ""
-
-#: ../data/glade/main.glade.h:27
-msgid "Submit statistical information"
-msgstr ""
-
-#: ../data/glade/main.glade.h:28
-msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
-msgstr ""
-
-#: ../data/glade/main.glade.h:29
-msgid "Updates"
-msgstr ""
-
-#: ../data/glade/main.glade.h:30
-msgid "_Download all updates in the background"
-msgstr ""
-
-#: ../data/glade/main.glade.h:31
-#, fuzzy
-msgid "_Import Key File..."
-msgstr "امپورٹ کی"
-
-#: ../data/glade/dialogs.glade.h:1
-msgid ""
-"<b><big>Testing download servers</big></b>\n"
-"\n"
-"A series of tests will be done to find the best mirror for your location."
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:9
-msgid "<b>Comment:</b>"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:10
-msgid "<b>Components:</b>"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:11
-msgid "<b>Distribution:</b>"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:12
-msgid "<b>Type:</b>"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:13
-msgid "<b>URI:</b>"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:14
-msgid ""
-"<big><b>Enter the complete APT line of the repository that you want to add "
-"as source</b></big>"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:15
-msgid "APT line:"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:16
-msgid ""
-"Binary\n"
-"Source"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:18
-msgid "Choose _Server"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:19
-msgid "Choose a Download Server"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:20
-msgid "Edit Source"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:21
-msgid "Performs a connection test to find the best mirror for your location"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:22
-msgid "Protocol:"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:23
-msgid "Scanning CD-ROM"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:24
-msgid "_Add Source"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:25
-msgid "_Reload"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:26
-msgid "_Replace"
-msgstr ""
-
-#: ../data/glade/dialogs.glade.h:27
-msgid "_Select Best Server"
-msgstr ""
-
-#~ msgid "After one week"
-#~ msgstr "ایک ھفتھ"
-
-#~ msgid "After two weeks"
-#~ msgstr "دو ھفتھ باد"
-
-#~ msgid "After one month"
-#~ msgstr "ایک ماھ باد"
-
-#~ msgid "After %s days"
-#~ msgstr "بعد %s دن"

=== modified file 'softwareproperties/gtk/CdromProgress.py'
--- softwareproperties/gtk/CdromProgress.py	2014-09-11 09:06:49 +0000
+++ softwareproperties/gtk/CdromProgress.py	2016-09-09 07:14:41 +0000
@@ -22,6 +22,8 @@
 import os
 
 import apt
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 from gettext import gettext as _
 

=== modified file 'softwareproperties/gtk/DialogAdd.py'
--- softwareproperties/gtk/DialogAdd.py	2014-09-11 09:06:49 +0000
+++ softwareproperties/gtk/DialogAdd.py	2016-09-09 07:14:41 +0000
@@ -24,6 +24,8 @@
 #  USA
 
 import os
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 from gettext import gettext as _
 

=== modified file 'softwareproperties/gtk/DialogAddSourcesList.py'
--- softwareproperties/gtk/DialogAddSourcesList.py	2015-06-09 11:27:37 +0000
+++ softwareproperties/gtk/DialogAddSourcesList.py	2016-09-09 07:14:41 +0000
@@ -2,6 +2,9 @@
 
 from __future__ import print_function
 
+import gi
+gi.require_version("Gdk", "3.0")
+gi.require_version("Gtk", "3.0")
 from gi.repository import GObject, Gdk, Gtk
 import os
 from gettext import gettext as _

=== modified file 'softwareproperties/gtk/DialogCacheOutdated.py'
--- softwareproperties/gtk/DialogCacheOutdated.py	2015-09-28 14:56:02 +0000
+++ softwareproperties/gtk/DialogCacheOutdated.py	2016-09-09 07:14:41 +0000
@@ -21,6 +21,8 @@
 #  USA
 
 import os
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import GObject, Gtk
 
 import aptdaemon.client

=== modified file 'softwareproperties/gtk/DialogEdit.py'
--- softwareproperties/gtk/DialogEdit.py	2014-09-11 09:06:49 +0000
+++ softwareproperties/gtk/DialogEdit.py	2016-09-09 07:14:41 +0000
@@ -25,6 +25,8 @@
 from __future__ import print_function
 
 import os
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
 from aptsources.sourceslist import SourceEntry

=== modified file 'softwareproperties/gtk/DialogMirror.py'
--- softwareproperties/gtk/DialogMirror.py	2016-06-20 18:08:26 +0000
+++ softwareproperties/gtk/DialogMirror.py	2016-09-09 07:14:41 +0000
@@ -21,6 +21,8 @@
 #  USA
 
 import os
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import GObject, Gtk
 from gettext import gettext as _
 import threading

=== modified file 'softwareproperties/gtk/SimpleGtkbuilderApp.py'
--- softwareproperties/gtk/SimpleGtkbuilderApp.py	2013-01-08 04:12:49 +0000
+++ softwareproperties/gtk/SimpleGtkbuilderApp.py	2016-09-09 07:14:41 +0000
@@ -20,6 +20,8 @@
 # USA
 
 import logging
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio
 from softwareproperties.gtk.utils import setup_ui
 LOG=logging.getLogger(__name__)

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2016-06-20 18:08:26 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2016-09-09 07:14:41 +0000
@@ -37,6 +37,9 @@
 import threading
 import sys
 
+import gi
+gi.require_version("Gdk", "3.0")
+gi.require_version("Gtk", "3.0")
 from gi.repository import GObject, Gdk, Gtk, Gio, GLib
 
 from .SimpleGtkbuilderApp import SimpleGtkbuilderApp

=== modified file 'softwareproperties/gtk/dialogs.py'
--- softwareproperties/gtk/dialogs.py	2011-01-25 17:56:51 +0000
+++ softwareproperties/gtk/dialogs.py	2016-09-09 07:14:41 +0000
@@ -21,6 +21,8 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
 def show_error_dialog(parent, primary, secondary):

=== modified file 'softwareproperties/gtk/utils.py'
--- softwareproperties/gtk/utils.py	2012-07-05 13:32:44 +0000
+++ softwareproperties/gtk/utils.py	2016-09-09 07:14:41 +0000
@@ -18,7 +18,10 @@
 
 from __future__ import print_function
 
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
+
 import logging
 LOG=logging.getLogger(__name__)
 

=== modified file 'tests/test_dbus.py'
--- tests/test_dbus.py	2013-06-26 11:30:21 +0000
+++ tests/test_dbus.py	2016-09-09 07:14:41 +0000
@@ -3,6 +3,8 @@
 
 from __future__ import print_function
 
+import gi
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib
 
 import atexit