- URL schemes are not translatable - In the datetime_spoke, remove the translatable flag from numbers and spaces, and added a translator comment for the HH:MM separator - For the add/remove/refresh ToolButtons in custom and source, the button labels aren't normally displayed, but attempting to translate Glade IDs is kind of weird so replaced the labels with more helpful labels. - Removed format strings from resize.glade since resize.py has its own versions of them. Left untranslated strings in the glade file as placeholders. --- pyanaconda/ui/gui/spokes/custom.glade | 6 +++--- pyanaconda/ui/gui/spokes/datetime_spoke.glade | 8 ++++---- pyanaconda/ui/gui/spokes/lib/resize.glade | 6 +++--- pyanaconda/ui/gui/spokes/source.glade | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index aa9184d..1b5de13 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -1622,7 +1622,7 @@ until you click on the main menu's 'Begin Installation' button.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Add a new mountpoint.</property> - <property name="label" translatable="yes">addButton</property> + <property name="label" translatable="yes">Add</property> <property name="use_underline">True</property> <property name="icon_name">list-add-symbolic</property> <signal name="clicked" handler="on_add_clicked" swapped="no"/> @@ -1639,7 +1639,7 @@ until you click on the main menu's 'Begin Installation' button.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Remove the selected mountpoint(s).</property> - <property name="label" translatable="yes">removeButton</property> + <property name="label" translatable="yes">Remove</property> <property name="use_underline">True</property> <property name="icon_name">list-remove-symbolic</property> <signal name="clicked" handler="on_remove_clicked" swapped="no"/> @@ -1656,7 +1656,7 @@ until you click on the main menu's 'Begin Installation' button.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Configure selected mountpoint.</property> - <property name="label" translatable="yes">configureButton</property> + <property name="label" translatable="yes">Configure</property> <property name="use_underline">True</property> <property name="icon_name">preferences-system-symbolic</property> <signal name="clicked" handler="on_configure_clicked" swapped="no"/> diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade index bb84ce6..e5cb6b9 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.glade +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade @@ -276,7 +276,7 @@ <object class="GtkLabel" id="hoursLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">00</property> + <property name="label">00</property> <attributes> <attribute name="scale" value="2"/> </attributes> @@ -292,7 +292,7 @@ <object class="GtkLabel" id="colonLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">:</property> + <property name="label" translatable="yes" comments="TRANSLATORS: This is the separator between hours and minutes, like in HH:MM">:</property> <attributes> <attribute name="scale" value="2"/> </attributes> @@ -308,7 +308,7 @@ <object class="GtkLabel" id="minutesLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">00</property> + <property name="label">00</property> <attributes> <attribute name="scale" value="2"/> </attributes> @@ -414,7 +414,7 @@ <object class="GtkLabel" id="spaceLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"> </property> + <property name="label"> </property> <attributes> <attribute name="scale" value="2"/> </attributes> diff --git a/pyanaconda/ui/gui/spokes/lib/resize.glade b/pyanaconda/ui/gui/spokes/lib/resize.glade index fc7e9f3..dd0e38e 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.glade +++ b/pyanaconda/ui/gui/spokes/lib/resize.glade @@ -308,7 +308,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes"><b>%s disks; %s reclaimable space</b> (in filesystems)</property> + <property name="label"><b>. disks; . reclaimable space</b> (in filesystems)</property> <property name="use_markup">True</property> </object> <packing> @@ -323,7 +323,7 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Total selected space to reclaim: <b>%s</b></property> + <property name="label">Total selected space to reclaim:</property> <property name="use_markup">True</property> </object> <packing> @@ -338,7 +338,7 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Installation requires a total of <b>%s</b> for system data.</property> + <property name="label">Installation requires a total of <b>.</b> for system data.</property> <property name="use_markup">True</property> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade index 3b0962a..91d716d 100644 --- a/pyanaconda/ui/gui/spokes/source.glade +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -753,9 +753,9 @@ <property name="can_focus">False</property> <property name="active">0</property> <items> - <item translatable="yes">http://</item> - <item translatable="yes">https://</item> - <item translatable="yes">ftp://</item> + <item>http://</item> + <item>https://</item> + <item>ftp://</item> <item translatable="yes">nfs</item> <item translatable="yes">Closest mirror</item> </items> @@ -1039,7 +1039,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Add a new repository.</property> <property name="tooltip_text" translatable="yes">Add a new repository.</property> - <property name="label" translatable="yes">addButton</property> + <property name="label" translatable="yes">Add</property> <property name="use_underline">True</property> <property name="icon_name">list-add-symbolic</property> <signal name="clicked" handler="on_addRepo_clicked" swapped="no"/> @@ -1058,7 +1058,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Remove the selected repository.</property> <property name="tooltip_text" translatable="yes">Remove the selected repository.</property> - <property name="label" translatable="yes">removeButton</property> + <property name="label" translatable="yes">Remove</property> <property name="use_underline">True</property> <property name="icon_name">list-remove-symbolic</property> <signal name="clicked" handler="on_removeRepo_clicked" swapped="no"/> @@ -1077,7 +1077,7 @@ <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Revert to the default list of repositories.</property> <property name="tooltip_text" translatable="yes">Revert to the default list of repositories.</property> - <property name="label" translatable="yes">resetButton</property> + <property name="label" translatable="yes">Reset</property> <property name="use_underline">True</property> <property name="icon_name">view-refresh</property> <signal name="clicked" handler="on_resetRepos_clicked" swapped="no"/> @@ -1217,9 +1217,9 @@ <property name="entry_text_column">0</property> <property name="id_column">1</property> <items> - <item translatable="yes">http://</item> - <item translatable="yes">https://</item> - <item translatable="yes">ftp://</item> + <item>http://</item> + <item>https://</item> + <item>ftp://</item> </items> <signal name="changed" handler="on_repoUrl_changed" swapped="no"/> </object>