Move all .ui files to a .glade extension.

xgettext is dumb and only looks at file extensions.  It has no way to let
you tell it what extension maps to what language on the command line.  Thus,
out glade files must be .glade if they are to get translated.

30 files changed, 29 insertions, 29 deletions

diff --git a/pyanaconda/ui/gui/Makefile.am b/pyanaconda/ui/gui/Makefile.am
index 7a3958cc3..51d43a8da 100644
--- a/pyanaconda/ui/gui/Makefile.am
+++ b/pyanaconda/ui/gui/Makefile.am
@@ -24,4 +24,4 @@ guidir       = $(pkgpyexecdir)/ui/gui
 gui_PYTHON   = *.py
 
 uidir        = $(datadir)/$(PACKAGE_NAME)/ui/
-dist_ui_DATA = *.ui
+dist_ui_DATA = *.glade
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index 6e4a7fb5d..1a7ecc89a 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -391,7 +391,7 @@ class UIObject(object):
 class QuitDialog(UIObject):
     builderObjects = ["quitDialog"]
     mainWidgetName = "quitDialog"
-    uiFile = "main.ui"
+    uiFile = "main.glade"
 
     def run(self):
         rc = self.window.run()
diff --git a/pyanaconda/ui/gui/hubs/Makefile.am b/pyanaconda/ui/gui/hubs/Makefile.am
index d1dad0a50..ae520a6e3 100644
--- a/pyanaconda/ui/gui/hubs/Makefile.am
+++ b/pyanaconda/ui/gui/hubs/Makefile.am
@@ -22,4 +22,4 @@ hubsdir        = $(pkgpyexecdir)/ui/gui/hubs
 hubs_PYTHON    = *.py
 
 uidir          = $(datadir)/$(PACKAGE_NAME)/ui/hubs
-dist_ui_DATA   = *.ui
+dist_ui_DATA   = *.glade
diff --git a/pyanaconda/ui/gui/hubs/progress.ui b/pyanaconda/ui/gui/hubs/progress.glade
index 1eb32c97e..1eb32c97e 100644
--- a/pyanaconda/ui/gui/hubs/progress.ui
+++ b/pyanaconda/ui/gui/hubs/progress.glade
diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py
index 2eb1b75de..f9c20234c 100644
--- a/pyanaconda/ui/gui/hubs/progress.py
+++ b/pyanaconda/ui/gui/hubs/progress.py
@@ -40,7 +40,7 @@ __all__ = ["ProgressHub"]
 class ProgressHub(Hub):
     builderObjects = ["progressWindow"]
     mainWidgetName = "progressWindow"
-    uiFile = "hubs/progress.ui"
+    uiFile = "hubs/progress.glade"
 
     def __init__(self, data, storage, payload, instclass):
         Hub.__init__(self, data, storage, payload, instclass)
diff --git a/pyanaconda/ui/gui/hubs/summary.ui b/pyanaconda/ui/gui/hubs/summary.glade
index 25aa16564..25aa16564 100644
--- a/pyanaconda/ui/gui/hubs/summary.ui
+++ b/pyanaconda/ui/gui/hubs/summary.glade
diff --git a/pyanaconda/ui/gui/hubs/summary.py b/pyanaconda/ui/gui/hubs/summary.py
index 4973ebe87..c867e496a 100644
--- a/pyanaconda/ui/gui/hubs/summary.py
+++ b/pyanaconda/ui/gui/hubs/summary.py
@@ -26,7 +26,7 @@ __all__ = ["SummaryHub"]
 class SummaryHub(Hub):
     builderObjects = ["summaryWindow"]
     mainWidgetName = "summaryWindow"
-    uiFile = "hubs/summary.ui"
+    uiFile = "hubs/summary.glade"
 
     # FIXME:  I really hate this.
 
diff --git a/pyanaconda/ui/gui/main.ui b/pyanaconda/ui/gui/main.glade
index 2f773a48f..2f773a48f 100644
--- a/pyanaconda/ui/gui/main.ui
+++ b/pyanaconda/ui/gui/main.glade
diff --git a/pyanaconda/ui/gui/spokes/Makefile.am b/pyanaconda/ui/gui/spokes/Makefile.am
index 4968a897d..352f4e4fb 100644
--- a/pyanaconda/ui/gui/spokes/Makefile.am
+++ b/pyanaconda/ui/gui/spokes/Makefile.am
@@ -24,4 +24,4 @@ spokesdir        = $(pkgpyexecdir)/ui/gui/spokes
 spokes_PYTHON    = *.py
 
 uidir            = $(datadir)/$(PACKAGE_NAME)/ui/spokes
-dist_ui_DATA     = *.ui
+dist_ui_DATA     = *.glade
diff --git a/pyanaconda/ui/gui/spokes/custom.ui b/pyanaconda/ui/gui/spokes/custom.glade
index 5f97efad1..5f97efad1 100644
--- a/pyanaconda/ui/gui/spokes/custom.ui
+++ b/pyanaconda/ui/gui/spokes/custom.glade
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 59326590b..27939576b 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -58,7 +58,7 @@ new_install_name = _("New %s %s Installation") % (productName, productVersion)
 class AddDialog(UIObject):
     builderObjects = ["addDialog"]
     mainWidgetName = "addDialog"
-    uiFile = "spokes/custom.ui"
+    uiFile = "spokes/custom.glade"
 
     def __init__(self, *args, **kwargs):
         UIObject.__init__(self, *args, **kwargs)
@@ -88,7 +88,7 @@ class AddDialog(UIObject):
 class ConfirmDeleteDialog(UIObject):
     builderObjects = ["confirmDeleteDialog"]
     mainWidgetName = "confirmDeleteDialog"
-    uiFile = "spokes/custom.ui"
+    uiFile = "spokes/custom.glade"
 
     def on_delete_cancel_clicked(self, button, *args):
         self.window.destroy()
@@ -115,7 +115,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                       "partitionStore",
                       "addImage", "removeImage", "settingsImage"]
     mainWidgetName = "customStorageWindow"
-    uiFile = "spokes/custom.ui"
+    uiFile = "spokes/custom.glade"
 
     category = StorageCategory
     title = N_("MANUAL PARTITIONING")
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.ui b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
index cdf1cf5b5..cdf1cf5b5 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.ui
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 42767bb99..314a886b7 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -46,7 +46,7 @@ POOL_SERVERS_NOTE = _("Note: pool servers may not be available all the time")
 class NTPconfigDialog(UIObject):
     builderObjects = ["ntpConfigDialog", "addImage", "serversStore"]
     mainWidgetName = "ntpConfigDialog"
-    uiFile = "spokes/datetime_spoke.ui"
+    uiFile = "spokes/datetime_spoke.glade"
 
     def __init__(self, *args):
         UIObject.__init__(self, *args)
@@ -244,7 +244,7 @@ class DatetimeSpoke(NormalSpoke):
                       ]
 
     mainWidgetName = "datetimeWindow"
-    uiFile = "spokes/datetime_spoke.ui"
+    uiFile = "spokes/datetime_spoke.glade"
 
     category = LocalizationCategory
 
diff --git a/pyanaconda/ui/gui/spokes/keyboard.ui b/pyanaconda/ui/gui/spokes/keyboard.glade
index 1243e22fb..1243e22fb 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.ui
+++ b/pyanaconda/ui/gui/spokes/keyboard.glade
diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 4f390d598..9ca60d64d 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -42,7 +42,7 @@ class AddLayoutDialog(UIObject):
     builderObjects = ["addLayoutDialog", "newLayoutStore",
                       "newLayoutStoreFilter", "newLayoutStoreSort"]
     mainWidgetName = "addLayoutDialog"
-    uiFile = "spokes/keyboard.ui"
+    uiFile = "spokes/keyboard.glade"
 
     def __init__(self, *args):
         UIObject.__init__(self, *args)
@@ -140,7 +140,7 @@ class KeyboardSpoke(NormalSpoke):
     builderObjects = ["addedLayoutStore", "keyboardWindow",
                       "addImage", "removeImage", "upImage", "downImage", "previewImage"]
     mainWidgetName = "keyboardWindow"
-    uiFile = "spokes/keyboard.ui"
+    uiFile = "spokes/keyboard.glade"
 
     category = LocalizationCategory
 
diff --git a/pyanaconda/ui/gui/spokes/lib/Makefile.am b/pyanaconda/ui/gui/spokes/lib/Makefile.am
index edf1be594..ecd597cbc 100644
--- a/pyanaconda/ui/gui/spokes/lib/Makefile.am
+++ b/pyanaconda/ui/gui/spokes/lib/Makefile.am
@@ -22,4 +22,4 @@ spokesdir        = $(pkgpyexecdir)/ui/gui/spokes/lib
 spokes_PYTHON    = *.py
 
 uidir            = $(datadir)/$(PACKAGE_NAME)/ui/spokes/lib
-dist_ui_DATA     = *.ui
+dist_ui_DATA     = *.glade
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.ui b/pyanaconda/ui/gui/spokes/lib/cart.glade
index 92fdfe53a..92fdfe53a 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.ui
+++ b/pyanaconda/ui/gui/spokes/lib/cart.glade
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
index 54f2acc7e..c40b7f58b 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -42,7 +42,7 @@ def size_str(mb):
 class SelectedDisksDialog(UIObject):
     builderObjects = ["selected_disks_dialog", "disk_store"]
     mainWidgetName = "selected_disks_dialog"
-    uiFile = "spokes/lib/cart.ui"
+    uiFile = "spokes/lib/cart.glade"
 
     def initialize(self, disks, free, showRemove=True):
         for disk in disks:
diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.ui b/pyanaconda/ui/gui/spokes/lib/detailederror.glade
index 72d98604c..72d98604c 100644
--- a/pyanaconda/ui/gui/spokes/lib/detailederror.ui
+++ b/pyanaconda/ui/gui/spokes/lib/detailederror.glade
diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.py b/pyanaconda/ui/gui/spokes/lib/detailederror.py
index 03df2f707..55dd43644 100644
--- a/pyanaconda/ui/gui/spokes/lib/detailederror.py
+++ b/pyanaconda/ui/gui/spokes/lib/detailederror.py
@@ -28,7 +28,7 @@ __all__ = ["DetailedErrorDialog"]
 class DetailedErrorDialog(UIObject):
     builderObjects = ["detailedErrorDialog", "detailedTextBuffer"]
     mainWidgetName = "detailedErrorDialog"
-    uiFile = "detailederror.ui"
+    uiFile = "detailederror.glade"
 
     def refresh(self, msg):
         buf = self.builder.get_object("detailedTextBuffer")
diff --git a/pyanaconda/ui/gui/spokes/network.ui b/pyanaconda/ui/gui/spokes/network.glade
index 49c75c289..49c75c289 100644
--- a/pyanaconda/ui/gui/spokes/network.ui
+++ b/pyanaconda/ui/gui/spokes/network.glade
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index b11fb4c3a..e0f3792f1 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -902,7 +902,7 @@ class NetworkControlBox():
 class NetworkSpoke(NormalSpoke):
     builderObjects = ["networkWindow", "liststore_wireless_network", "liststore_devices"]
     mainWidgetName = "networkWindow"
-    uiFile = "spokes/network.ui"
+    uiFile = "spokes/network.glade"
 
     title = N_("NETWORK CONFIGURATION")
     icon = "network-transmit-receive-symbolic"
@@ -962,7 +962,7 @@ class NetworkSpoke(NormalSpoke):
 class NetworkStandaloneSpoke(StandaloneSpoke):
     builderObjects = ["networkStandaloneWindow", "networkControlBox_vbox", "liststore_wireless_network", "liststore_devices"]
     mainWidgetName = "networkStandaloneWindow"
-    uiFile = "spokes/network.ui"
+    uiFile = "spokes/network.glade"
 
     preForHub = SummaryHub
     priority = 10
@@ -1040,7 +1040,7 @@ if __name__ == "__main__":
 
     builder = Gtk.Builder()
     import os
-    ui_file_path = os.environ.get('UIPATH')+'spokes/network.ui'
+    ui_file_path = os.environ.get('UIPATH')+'spokes/network.glade'
     builder.add_from_file(ui_file_path)
 
     n = NetworkControlBox(builder)
diff --git a/pyanaconda/ui/gui/spokes/software.ui b/pyanaconda/ui/gui/spokes/software.glade
index d0d91325e..d0d91325e 100644
--- a/pyanaconda/ui/gui/spokes/software.ui
+++ b/pyanaconda/ui/gui/spokes/software.glade
diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
index 07c001d28..eccf4d387 100644
--- a/pyanaconda/ui/gui/spokes/software.py
+++ b/pyanaconda/ui/gui/spokes/software.py
@@ -39,7 +39,7 @@ __all__ = ["SoftwareSelectionSpoke"]
 class SoftwareSelectionSpoke(NormalSpoke):
     builderObjects = ["addonStore", "desktopStore", "softwareWindow"]
     mainWidgetName = "softwareWindow"
-    uiFile = "spokes/software.ui"
+    uiFile = "spokes/software.glade"
 
     category = SoftwareCategory
 
diff --git a/pyanaconda/ui/gui/spokes/source.ui b/pyanaconda/ui/gui/spokes/source.glade
index 5259431bc..5259431bc 100644
--- a/pyanaconda/ui/gui/spokes/source.ui
+++ b/pyanaconda/ui/gui/spokes/source.glade
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 68020c88e..447405270 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -48,7 +48,7 @@ METADATA_ERROR_MESSAGE = _("Error downloading package metadata...")
 class ProxyDialog(UIObject):
     builderObjects = ["proxyDialog"]
     mainWidgetName = "proxyDialog"
-    uiFile = "spokes/source.ui"
+    uiFile = "spokes/source.glade"
 
     def on_proxy_cancel_clicked(self, *args):
         self.window.destroy()
@@ -129,7 +129,7 @@ class ProxyDialog(UIObject):
 class MediaCheckDialog(UIObject):
     builderObjects = ["mediaCheckDialog"]
     mainWidgetName = "mediaCheckDialog"
-    uiFile = "spokes/source.ui"
+    uiFile = "spokes/source.glade"
 
     def _checkisoEndsCB(self, pid, status):
         doneButton = self.builder.get_object("doneButton")
@@ -196,7 +196,7 @@ class MediaCheckDialog(UIObject):
 class IsoChooser(UIObject):
     builderObjects = ["isoChooserDialog", "isoFilter"]
     mainWidgetName = "isoChooserDialog"
-    uiFile = "spokes/source.ui"
+    uiFile = "spokes/source.glade"
 
     def refresh(self, currentFile=""):
         UIObject.refresh(self)
@@ -238,7 +238,7 @@ class IsoChooser(UIObject):
 class AdditionalReposDialog(UIObject):
     builderObjects = ["additionalReposDialog", "peopleRepositories", "peopleRepositoriesFilter"]
     mainWidgetName = "additionalReposDialog"
-    uiFile = "spokes/source.ui"
+    uiFile = "spokes/source.glade"
 
     typingTimeout = 1
 
@@ -409,7 +409,7 @@ class AdditionalReposDialog(UIObject):
 class SourceSpoke(NormalSpoke):
     builderObjects = ["isoChooser", "isoFilter", "partitionStore", "sourceWindow", "dirImage"]
     mainWidgetName = "sourceWindow"
-    uiFile = "spokes/source.ui"
+    uiFile = "spokes/source.glade"
 
     category = SoftwareCategory
 
diff --git a/pyanaconda/ui/gui/spokes/storage.ui b/pyanaconda/ui/gui/spokes/storage.glade
index 16fa40271..16fa40271 100644
--- a/pyanaconda/ui/gui/spokes/storage.ui
+++ b/pyanaconda/ui/gui/spokes/storage.glade
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index fcf9ffe10..23b09770a 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -113,7 +113,7 @@ def size_str(mb):
 class InstallOptions1Dialog(UIObject):
     builderObjects = ["options1_dialog"]
     mainWidgetName = "options1_dialog"
-    uiFile = "spokes/storage.ui"
+    uiFile = "spokes/storage.glade"
 
     RESPONSE_CANCEL = 0
     RESPONSE_CONTINUE = 1
@@ -257,7 +257,7 @@ class StorageChecker(object):
 class StorageSpoke(NormalSpoke, StorageChecker):
     builderObjects = ["storageWindow"]
     mainWidgetName = "storageWindow"
-    uiFile = "spokes/storage.ui"
+    uiFile = "spokes/storage.glade"
 
     category = StorageCategory
 
diff --git a/pyanaconda/ui/gui/spokes/welcome.ui b/pyanaconda/ui/gui/spokes/welcome.glade
index e5bcc0f7d..e5bcc0f7d 100644
--- a/pyanaconda/ui/gui/spokes/welcome.ui
+++ b/pyanaconda/ui/gui/spokes/welcome.glade
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index 9c899eb4a..dc4c733ce 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -190,7 +190,7 @@ class LanguageMixIn(object):
 
 class WelcomeLanguageSpoke(LanguageMixIn, StandaloneSpoke):
     mainWidgetName = "welcomeWindow"
-    uiFile = "spokes/welcome.ui"
+    uiFile = "spokes/welcome.glade"
     builderObjects = LanguageMixIn.builderObjects + [mainWidgetName, "betaWarnDialog"]
 
     preForHub = SummaryHub
@@ -234,7 +234,7 @@ class WelcomeLanguageSpoke(LanguageMixIn, StandaloneSpoke):
 
 class LanguageSpoke(LanguageMixIn, NormalSpoke):
     mainWidgetName = "languageSpokeWindow"
-    uiFile = "spokes/welcome.ui"
+    uiFile = "spokes/welcome.glade"
     builderObjects = LanguageMixIn.builderObjects + [mainWidgetName, WelcomeLanguageSpoke.mainWidgetName]
 
     category = LocalizationCategory