[gnome-boxes] Use URL in strings instead of URI

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit a01f426b33891b5a8f8437787d606a100526b6fb
Author: Pavel Grunt <pgrunt redhat com>
Date:   Fri May 13 09:56:13 2016 +0200

    Use URL in strings instead of URI
    
    https://bugzilla.gnome.org/show_bug.cgi?id=743303

 src/app.vala                        |    2 +-
 src/libvirt-machine-properties.vala |    4 ++--
 src/ovirt-machine.vala              |    2 +-
 src/remote-machine.vala             |    4 ++--
 src/spice-display.vala              |    8 ++++----
 src/vnc-display.vala                |    4 ++--
 src/wizard.vala                     |    6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/app.vala b/src/app.vala
index e5e24eb..8fbf455 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -182,7 +182,7 @@ private class Boxes.App: Gtk.Application {
         { "open-uuid", 0, 0, OptionArg.STRING, ref opt_open_uuid, N_("Open box with UUID"), null },
         { "search", 0, 0, OptionArg.STRING_ARRAY, ref opt_search, N_("Search term"), null },
         // A 'broker' is a virtual-machine manager (local or remote). Currently libvirt and ovirt are 
supported.
-        { "", 0, 0, OptionArg.STRING_ARRAY, ref opt_uris, N_("URI to display, broker or installer media"), 
null },
+        { "", 0, 0, OptionArg.STRING_ARRAY, ref opt_uris, N_("URL to display, broker or installer media"), 
null },
         { null }
     };
 
diff --git a/src/libvirt-machine-properties.vala b/src/libvirt-machine-properties.vala
index b38910c..95b7825 100644
--- a/src/libvirt-machine-properties.vala
+++ b/src/libvirt-machine-properties.vala
@@ -134,8 +134,8 @@ private class Boxes.LibvirtMachineProperties: GLib.Object, Boxes.IPropertiesProv
                 // Translators: This is the protocal being used to connect to the display/desktop, e.g 
Spice, VNC, etc.
                 add_string_property (ref list, _("Display Protocol"), machine.display.protocol);
                 if (machine.display.uri != null)
-                    // Translators: This is the URI to connect to the display/desktop. e.g 
spice://somehost:5051.
-                    add_string_property (ref list, _("Display URI"), machine.display.uri);
+                    // Translators: This is the URL to connect to the display/desktop. e.g 
spice://somehost:5051.
+                    add_string_property (ref list, _("Display URL"), machine.display.uri);
             }
 
             break;
diff --git a/src/ovirt-machine.vala b/src/ovirt-machine.vala
index 20896ab..04058af 100644
--- a/src/ovirt-machine.vala
+++ b/src/ovirt-machine.vala
@@ -70,7 +70,7 @@ private class Boxes.OvirtMachine: Boxes.Machine {
         case PropertiesPage.GENERAL:
             add_string_property (ref list, _("Broker"), source.name);
             add_string_property (ref list, _("Protocol"), display.protocol);
-            add_string_property (ref list, _("URI"), display.uri);
+            add_string_property (ref list, _("URL"), display.uri);
             break;
         }
 
diff --git a/src/remote-machine.vala b/src/remote-machine.vala
index 6ed9bbc..eff4711 100644
--- a/src/remote-machine.vala
+++ b/src/remote-machine.vala
@@ -67,9 +67,9 @@ private class Boxes.RemoteMachine: Boxes.Machine, Boxes.IPropertiesProvider {
 
             add_string_property (ref list, _("Protocol"), source.source_type.up ());
             if (is_connected) {
-                add_string_property (ref list, _("URI"), source.uri);
+                add_string_property (ref list, _("URL"), source.uri);
             } else {
-                property = add_editable_string_property (ref list, _("_URI"), source.uri);
+                property = add_editable_string_property (ref list, _("_URL"), source.uri);
                 property.changed.connect ((property, uri) => {
                     source.uri = uri;
                });
diff --git a/src/spice-display.vala b/src/spice-display.vala
index b687ca3..9fda879 100644
--- a/src/spice-display.vala
+++ b/src/spice-display.vala
@@ -202,7 +202,7 @@ private class Boxes.SpiceDisplay: Boxes.Display {
     }
 
     public override void collect_logs (StringBuilder builder) {
-        builder.append_printf ("URI: %s\n", uri);
+        builder.append_printf ("URL: %s\n", uri);
         if (gtk_session != null) {
             builder.append_printf ("Auto clipboard sync: %s\n", gtk_session.auto_clipboard ? "yes" : "no");
         }
@@ -531,7 +531,7 @@ static void spice_validate_uri (string uri_as_text,
     var uri = Xml.URI.parse (uri_as_text);
 
     if (uri == null)
-        throw new Boxes.Error.INVALID (_("Invalid URI"));
+        throw new Boxes.Error.INVALID (_("Invalid URL"));
 
     tls_port = 0;
     port = uri.port;
@@ -552,11 +552,11 @@ static void spice_validate_uri (string uri_as_text,
     if (uri.scheme == "spice+unix") {
         if (port > 0 ||
             (uri.query_raw ?? uri.query) != null)
-            throw new Boxes.Error.INVALID (_("Invalid Spice UNIX URI"));
+            throw new Boxes.Error.INVALID (_("Invalid Spice UNIX URL"));
     } else if (uri.scheme.has_prefix("spice+")) {
         throw new Boxes.Error.INVALID (_("Invalid URI"));
     } else {
         if (port <= 0 && tls_port <= 0)
-            throw new Boxes.Error.INVALID (_("Missing port in Spice URI"));
+            throw new Boxes.Error.INVALID (_("Missing port in Spice URL"));
     }
 }
diff --git a/src/vnc-display.vala b/src/vnc-display.vala
index 7cbf4df..481f766 100644
--- a/src/vnc-display.vala
+++ b/src/vnc-display.vala
@@ -86,10 +86,10 @@ private class Boxes.VncDisplay: Boxes.Display {
         var uri = Xml.URI.parse (_uri);
 
         if (uri.scheme != "vnc")
-            throw new Boxes.Error.INVALID ("the URI is not vnc://");
+            throw new Boxes.Error.INVALID ("the URL is not vnc://");
 
         if (uri.server == null)
-            throw new Boxes.Error.INVALID ("the URI is missing a server");
+            throw new Boxes.Error.INVALID ("the URL is missing a server");
 
         this.host = uri.server;
         this.port = uri.port <= 0 ? 5900 : uri.port;
diff --git a/src/wizard.vala b/src/wizard.vala
index f715eab..f07b6d9 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -307,14 +307,14 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
     private void prepare_for_uri (string uri_as_text) throws Boxes.Error {
         var uri = Xml.URI.parse (uri_as_text);
         if (uri == null || uri.scheme == null)
-            throw new Boxes.Error.INVALID (_("Invalid URI"));
+            throw new Boxes.Error.INVALID (_("Invalid URL"));
 
         if (wizard_source.download_required) {
             var file = File.new_for_uri (uri_as_text);
             var basename = file.get_basename ();
 
             if (basename == null || basename == "" || basename == "/")
-                throw new Boxes.Error.INVALID (_("Invalid URI"));
+                throw new Boxes.Error.INVALID (_("Invalid URL"));
 
             return;
         }
@@ -485,7 +485,7 @@ private class Boxes.Wizard: Gtk.Stack, Boxes.UI {
             if (uri != null && uri.server != null)
                 summary.add_property (_("Host"), uri.server.down ());
             else
-                summary.add_property (_("URI"), source.uri.down ());
+                summary.add_property (_("URL"), source.uri.down ());
 
             switch (uri.scheme) {
             case "spice":