[Merge] ~nteodosio/software-properties:ubuntu/master into software-properties:ubuntu/master
Robert Ancell
mp+434360 at code.launchpad.net
Sun Dec 11 22:08:29 UTC 2022
Review: Approve
Looks good, just a couple of minor translation fixes.
Diff comments:
> diff --git a/data/gtkbuilder/dialog-ua-attach.ui b/data/gtkbuilder/dialog-ua-attach.ui
> index 3ae3b1b..64eb2ec 100644
> --- a/data/gtkbuilder/dialog-ua-attach.ui
> +++ b/data/gtkbuilder/dialog-ua-attach.ui
> @@ -1,119 +1,195 @@
> -<?xml version="1.0"?>
> +<?xml version="1.0" encoding="UTF-8"?>
> <interface>
> + <requires lib="gtk+" version="3.16"/>
> <object class="GtkDialog" id="dialog_ua_attach">
> - <property name="border_width">18</property>
> + <property name="can-focus">False</property>
> + <property name="border-width">18</property>
> <property name="title" translatable="yes">Enable Ubuntu Pro</property>
> <property name="resizable">False</property>
> <property name="modal">True</property>
> - <property name="type_hint">dialog</property>
> - <property name="skip_taskbar_hint">True</property>
> + <property name="type-hint">dialog</property>
> + <property name="skip-taskbar-hint">True</property>
> + <!-- interface-requires gtk+ 3.0 -->
> <child internal-child="vbox">
> <object class="GtkBox">
> + <property name="visible">True</property>
> + <property name="can-focus">False</property>
> + <property name="no-show-all">True</property>
> <property name="orientation">vertical</property>
> - <property name="spacing">18</property>
> + <child>
> + <object class="GtkLabel">
> + <property name="visible">True</property>
> + <property name="can-focus">True</property>
> + <property name="label" translatable="yes">To upgrade to Ubuntu Pro, use your existing free personal, or company Ubuntu One account, or provide a token. <a href="https://ubuntu.com/login">Register a new account</a>.</property>
> + <property name="use-markup">True</property>
> + <property name="wrap">True</property>
> + <property name="max-width-chars">130</property>
> + </object>
> + </child>
> + <child>
> + <object class="GtkRadioButton" id="magic_radio">
> + <property name="label" translatable="yes">Log in with Ubuntu One</property>
> + <property name="visible">True</property>
> + <property name="can-focus">True</property>
> + <property name="receives-default">False</property>
> + <property name="margin-top">30</property>
> + <property name="xalign">0</property>
> + <property name="group">magic_radio</property>
> + <signal name="toggled" handler="on_radio_toggled" swapped="no"/>
> + <signal name="clicked" handler="on_magic_radio_clicked" swapped="no"/>
> + </object>
> + </child>
> <child>
> <object class="GtkBox">
> <property name="visible">True</property>
> - <property name="orientation">vertical</property>
> - <property name="spacing">18</property>
> + <property name="can-focus">False</property>
> + <property name="orientation">horizontal</property>
> <child>
> - <object class="GtkLabel">
> + <object class="GtkBox" id="pin_label_box">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Enter your Ubuntu Pro token here.
> -From <a href="https://ubuntu.com/pro">ubuntu.com/pro</a> or your system administrator</property>
> - <property name="use_markup">True</property>
> - <property name="xalign">0</property>
> + <property name="margin-left">20</property>
> + <property name="margin-top">12</property>
> + <property name="margin-bottom">8</property>
> + <property name="can-focus">False</property>
> + <child>
> + <object class="GtkLabel" id="pin_label">
> + <property name="label" translatable="yes"> </property>
This should probably not be translatable.
> + <property name="visible">True</property>
> + <property name="selectable">True</property>
> + <property name="can-focus">False</property>
> + <property name="halign">start</property>
> + <property name="margin-left">6</property>
> + <property name="margin-right">6</property>
> + <property name="margin-top">4</property>
> + <property name="margin-bottom">4</property>
> + <property name="label" translatable="yes"/>
This property can be dropped - the default label is the empty string.
> + <attributes>
> + <attribute name="scale" value="2"/>
> + </attributes>
> + </object>
> + </child>
> </object>
> </child>
> <child>
> - <object class="GtkGrid">
> + <object class="GtkFixed">
> <property name="visible">True</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">12</property>
> + <property name="valign">center</property>
> + <property name="margin">3</property>
> <child>
> - <object class="GtkLabel">
> + <object class="GtkSpinner" id="pin_spinner">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Token:</property>
> + <property name="valign">center</property>
> </object>
> - <packing>
> - <property name="left_attach">0</property>
> - <property name="top_attach">0</property>
> - </packing>
> </child>
> <child>
> - <object class="GtkBox">
> - <property name="visible">True</property>
> - <property name="spacing">12</property>
> - <child>
> - <object class="GtkEntry" id="entry_token">
> - <property name="visible">True</property>
> - <property name="max-width-chars">30</property>
> - <signal name="changed" handler="on_token_entry_changed"/>
> - <signal name="activate" handler="on_token_entry_activate"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkSpinner" id="spinner">
> - <property name="visible">True</property>
> - </object>
> - </child>
> + <object class="GtkImage" id="pin_status_icon">
> + <property name="visible">False</property>
> + <property name="valign">center</property>
> </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="top_attach">0</property>
> - </packing>
> </child>
> + </object>
> + </child>
> + <child>
> + <object class="GtkLabel" id="pin_status">
> + <property name="margin">3</property>
> + <property name="visible">True</property>
> + <property name="valign">center</property>
> + <property name="use-markup">True</property>
> + </object>
> + </child>
> + </object>
> + </child>
> + <child>
> + <object class="GtkRadioButton" id="token_radio">
> + <property name="label" translatable="yes">Or add token manually</property>
> + <property name="visible">True</property>
> + <property name="can-focus">True</property>
> + <property name="receives-default">False</property>
> + <property name="margin-top">6</property>
> + <property name="xalign">0</property>
> + <property name="group">magic_radio</property>
> + <signal name="toggled" handler="on_radio_toggled" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkBox">
> + <property name="visible">True</property>
> + <property name="can-focus">False</property>
> + <property name="no-show-all">True</property>
> + <child>
> + <object class="GtkEntry" id="token_field">
> + <property name="visible">True</property>
> + <property name="sensitive">False</property>
> + <property name="can-focus">True</property>
> + <property name="margin-left">20</property>
> + <property name="margin-top">12</property>
> + <property name="margin-bottom">12</property>
> + <property name="margin-right">4</property>
> + <property name="width-chars">35</property>
> + <property name="placeholder-text" translatable="yes">Token</property>
> + <property name="halign">start</property>
> + <signal name="activate" handler="on_token_entry_activate" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkFixed">
> + <property name="visible">True</property>
> + <property name="valign">center</property>
> + <property name="margin">3</property>
> <child>
> - <object class="GtkLabel">
> + <object class="GtkSpinner" id="token_spinner">
> <property name="visible">True</property>
> - <property name="xalign">0</property>
> - <property name="label" translatable="yes"><a href="https://login.ubuntu.com">Don't have a token yet? Register</a></property>
> - <property name="use_markup">True</property>
> + <property name="valign">center</property>
> </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="top_attach">1</property>
> - </packing>
> </child>
> <child>
> - <object class="GtkLabel" id="label_attach_error">
> - <property name="visible">True</property>
> - <property name="xalign">0</property>
> - <attributes>
> - <attribute name="foreground" value="red"/>
> - <attribute name="scale" value="0.9"/>
> - </attributes>
> + <object class="GtkImage" id="token_status_icon">
> + <property name="visible">False</property>
> + <property name="valign">center</property>
> </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="top_attach">2</property>
> - </packing>
> </child>
> </object>
> </child>
> + <child>
> + <object class="GtkLabel" id="token_status">
> + <property name="margin">3</property>
> + <property name="visible">True</property>
> + <property name="valign">center</property>
> + <property name="use-markup">True</property>
> + </object>
> + </child>
> </object>
> </child>
> - </object>
> - </child>
> - <child internal-child="action_area">
> - <object class="GtkHButtonBox">
> - <property name="visible">True</property>
> - <property name="layout_style">end</property>
> <child>
> - <object class="GtkButton">
> + <object class="GtkLabel">
> <property name="visible">True</property>
> - <property name="label" translatable="yes">Cance_l</property>
> - <property name="use_underline">True</property>
> - <signal name="clicked" handler="on_cancel_clicked"/>
> + <property name="halign">start</property>
> + <property name="margin-left">20</property>
> + <property name="use-markup">True</property>
> + <property name="label" translatable="yes">From your admin, or from <a href="https://ubuntu.com/pro">ubuntu.com/pro</a></property>
> </object>
> </child>
> <child>
> - <object class="GtkButton" id="button_attach">
> + <object class="GtkBox">
> <property name="visible">True</property>
> - <property name="sensitive">False</property>
> - <property name="label" translatable="yes">_Continue</property>
> - <property name="use_underline">True</property>
> - <signal name="clicked" handler="on_attach_clicked"/>
> + <property name="orientation">horizontal</property>
> + <property name="halign">end</property>
> + <child>
> + <object class="GtkButton" id="cancel">
> + <property name="visible">True</property>
> + <property name="margin-right">10</property>
> + <property name="label" translatable="yes">Cancel</property>
> + <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkButton" id="confirm">
> + <property name="visible">True</property>
> + <property name="label" translatable="yes">Confirm</property>
> + <property name="sensitive">False</property>
> + <signal name="clicked" handler="on_confirm_clicked" swapped="no"/>
> + </object>
> + </child>
> </object>
> </child>
> </object>
--
https://code.launchpad.net/~nteodosio/software-properties/+git/software-properties/+merge/434360
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.
More information about the Ubuntu-reviews
mailing list