diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /fpicker/uiconfig | |
parent | fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff) |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'fpicker/uiconfig')
-rw-r--r-- | fpicker/uiconfig/ui/explorerfiledialog.ui | 24 | ||||
-rw-r--r-- | fpicker/uiconfig/ui/foldernamedialog.ui | 8 | ||||
-rw-r--r-- | fpicker/uiconfig/ui/remotefilesdialog.ui | 24 |
3 files changed, 28 insertions, 28 deletions
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui index 04c4f824d692..58b268fcc423 100644 --- a/fpicker/uiconfig/ui/explorerfiledialog.ui +++ b/fpicker/uiconfig/ui/explorerfiledialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="fps"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="ExplorerFileDialog"> @@ -69,16 +69,16 @@ </child> <child> <object class="GtkButton" id="connect_to_server"> - <property name="label" translatable="yes">Servers...</property> + <property name="label" translatable="yes" context="explorerfiledialog|connect_to_server">Servers...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Connect To Server</property> + <property name="tooltip_text" translatable="yes" context="explorerfiledialog|connect_to_server|tooltip_text">Connect To Server</property> <child internal-child="accessible"> <object class="AtkObject" id="connect_to_server-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Connect To Server</property> + <property name="AtkObject::accessible-name" translatable="yes" context="explorerfiledialog|connect_to_server-atkobject">Connect To Server</property> </object> </child> </object> @@ -110,10 +110,10 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Create New Folder</property> + <property name="tooltip_text" translatable="yes" context="explorerfiledialog|new_folder|tooltip_text">Create New Folder</property> <child internal-child="accessible"> <object class="AtkObject" id="new_folder-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Create New Folder</property> + <property name="AtkObject::accessible-name" translatable="yes" context="explorerfiledialog|new_folder-atkobject">Create New Folder</property> </object> </child> </object> @@ -249,7 +249,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">File _name:</property> + <property name="label" translatable="yes" context="explorerfiledialog|file_name_label">File _name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">file_name</property> </object> @@ -274,7 +274,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">File _type:</property> + <property name="label" translatable="yes" context="explorerfiledialog|file_type_label">File _type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">file_type</property> </object> @@ -370,7 +370,7 @@ </child> <child> <object class="GtkCheckButton" id="readonly"> - <property name="label" translatable="yes">_Read-only</property> + <property name="label" translatable="yes" context="explorerfiledialog|readonly">_Read-only</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -394,7 +394,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="password"> - <property name="label" translatable="yes">Save with password</property> + <property name="label" translatable="yes" context="explorerfiledialog|password">Save with password</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -408,7 +408,7 @@ </child> <child> <object class="GtkCheckButton" id="extension"> - <property name="label" translatable="yes">_Automatic file name extension</property> + <property name="label" translatable="yes" context="explorerfiledialog|extension">_Automatic file name extension</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -423,7 +423,7 @@ </child> <child> <object class="GtkCheckButton" id="options"> - <property name="label" translatable="yes">Edit _filter settings</property> + <property name="label" translatable="yes" context="explorerfiledialog|options">Edit _filter settings</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/fpicker/uiconfig/ui/foldernamedialog.ui b/fpicker/uiconfig/ui/foldernamedialog.ui index d6e171203366..11fb27a728c5 100644 --- a/fpicker/uiconfig/ui/foldernamedialog.ui +++ b/fpicker/uiconfig/ui/foldernamedialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="fps"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="FolderNameDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Folder Name ?</property> + <property name="title" translatable="yes" context="foldernamedialog|FolderNameDialog">Folder Name ?</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -81,7 +81,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Na_me</property> + <property name="label" translatable="yes" context="foldernamedialog|label2">Na_me</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry</property> </object> @@ -112,7 +112,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Create New Folder</property> + <property name="label" translatable="yes" context="foldernamedialog|label1">Create New Folder</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui index bcb3cd2a6013..5b1b736424a7 100644 --- a/fpicker/uiconfig/ui/remotefilesdialog.ui +++ b/fpicker/uiconfig/ui/remotefilesdialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="fps"> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> @@ -15,7 +15,7 @@ <object class="GtkDialog" id="RemoteFilesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Remote Files</property> + <property name="title" translatable="yes" context="remotefilesdialog|RemoteFilesDialog">Remote Files</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -102,7 +102,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Service:</property> + <property name="label" translatable="yes" context="remotefilesdialog|label1">Service:</property> <accessibility> <relation type="label-for" target="services_lb"/> </accessibility> @@ -129,7 +129,7 @@ </child> <child> <object class="GtkButton" id="add_service_btn:service_edit_menu"> - <property name="label" translatable="yes">Add service</property> + <property name="label" translatable="yes" context="remotefilesdialog|add_service_btn">Add service</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -174,7 +174,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">List view</property> + <property name="tooltip_text" translatable="yes" context="remotefilesdialog|list_view|tooltip_text">List view</property> <property name="image">image2</property> </object> <packing> @@ -189,7 +189,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Icon view</property> + <property name="tooltip_text" translatable="yes" context="remotefilesdialog|icon_view|tooltip_text">Icon view</property> <property name="image">image1</property> </object> <packing> @@ -207,7 +207,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Create New Folder</property> + <property name="tooltip_text" translatable="yes" context="remotefilesdialog|new_folder|tooltip_text">Create New Folder</property> <property name="margin_left">6</property> </object> <packing> @@ -252,7 +252,7 @@ <object class="GtkLabel" id="filterLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Filter</property> + <property name="label" translatable="yes" context="remotefilesdialog|filterLabel">Filter</property> <property name="xalign">0</property> </object> <packing> @@ -264,7 +264,7 @@ <object class="GtkLabel" id="nameLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">File name</property> + <property name="label" translatable="yes" context="remotefilesdialog|nameLabel">File name</property> <property name="xalign">0</property> </object> <packing> @@ -315,7 +315,7 @@ <object class="GtkMenuItem" id="edit_service"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Edit service</property> + <property name="label" translatable="yes" context="remotefilesdialog|edit_service">_Edit service</property> <property name="use_underline">True</property> </object> </child> @@ -323,7 +323,7 @@ <object class="GtkMenuItem" id="delete_service"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Delete service</property> + <property name="label" translatable="yes" context="remotefilesdialog|delete_service">_Delete service</property> <property name="use_underline">True</property> </object> </child> @@ -331,7 +331,7 @@ <object class="GtkMenuItem" id="change_password"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Change password</property> + <property name="label" translatable="yes" context="remotefilesdialog|change_password">_Change password</property> <property name="use_underline">True</property> </object> </child> |