From 4eb800f5fad1a749e8ff11d7b342ff66e1d8e3a2 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 17 Nov 2009 16:47:49 +0100 Subject: Remove markup from translatable strings in ui files GTKBuilder format allows to separate markup from translatable content. Whenever possible, this should be preferred so as there is less content to translate and less error opportunities. --- addressbook/gui/contact-editor/contact-editor.ui | 60 ++++-- .../gui/contact-list-editor/contact-list-editor.ui | 6 +- calendar/gui/dialogs/alarm-dialog.ui | 18 +- calendar/gui/dialogs/cal-prefs-dialog.ui | 54 ++++-- calendar/gui/dialogs/recurrence-page.ui | 17 +- calendar/gui/dialogs/task-details-page.ui | 12 +- filter/filter.ui | 6 +- mail/mail-config.ui | 204 ++++++++++++++------- mail/mail-dialogs.ui | 18 +- plugins/exchange-operations/exchange-oof.ui | 20 +- .../exchange-permissions-dialog.ui | 6 +- .../exchange-operations/exchange-send-options.ui | 12 +- plugins/groupwise-features/junk-settings.ui | 6 +- plugins/groupwise-features/proxy-add-dialog.ui | 6 +- plugins/imap-features/imap-headers.ui | 12 +- plugins/publish-calendar/publish-calendar.ui | 24 ++- smime/gui/smime-ui.ui | 48 +++-- widgets/e-timezone-dialog/e-timezone-dialog.ui | 12 +- widgets/misc/e-send-options.ui | 24 ++- 19 files changed, 377 insertions(+), 188 deletions(-) diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index e8104cb60d..964ce434c2 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -622,9 +622,8 @@ True - <b>Email</b> + Email False - True GTK_JUSTIFY_LEFT False False @@ -636,6 +635,9 @@ -1 False 0 + + + @@ -973,9 +975,8 @@ True - <b>Telephone</b> + Telephone False - True GTK_JUSTIFY_LEFT False False @@ -987,6 +988,9 @@ -1 False 0 + + + 0 @@ -1197,9 +1201,8 @@ True - <b>Instant Messaging</b> + Instant Messaging False - True GTK_JUSTIFY_LEFT False False @@ -1211,6 +1214,9 @@ -1 False 0 + + + @@ -1504,9 +1510,8 @@ True - <b>Web Addresses</b> + Web Addresses False - True GTK_JUSTIFY_LEFT False False @@ -1518,6 +1523,9 @@ -1 False 0 + + + @@ -1847,9 +1855,8 @@ True - <b>Job</b> + Job False - True GTK_JUSTIFY_LEFT False False @@ -1861,6 +1868,9 @@ -1 False 0 + + + @@ -2090,9 +2100,8 @@ True - <b>Miscellaneous</b> + Miscellaneous False - True GTK_JUSTIFY_LEFT False False @@ -2104,6 +2113,9 @@ -1 False 0 + + + @@ -2495,9 +2507,8 @@ True - <b>Home</b> + Home False - True GTK_JUSTIFY_LEFT False False @@ -2509,6 +2520,9 @@ -1 False 0 + + + @@ -2870,9 +2884,8 @@ True - <b>Work</b> + Work False - True GTK_JUSTIFY_LEFT False False @@ -2884,6 +2897,9 @@ -1 False 0 + + + @@ -3245,9 +3261,8 @@ True - <b>Other</b> + Other False - True GTK_JUSTIFY_LEFT False False @@ -3259,6 +3274,9 @@ -1 False 0 + + + @@ -3364,9 +3382,8 @@ True - <b>Notes</b> + Notes False - True GTK_JUSTIFY_LEFT False False @@ -3378,6 +3395,9 @@ -1 False 0 + + + diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.ui b/addressbook/gui/contact-list-editor/contact-list-editor.ui index 37d0d94746..0c1e21cf68 100644 --- a/addressbook/gui/contact-list-editor/contact-list-editor.ui +++ b/addressbook/gui/contact-list-editor/contact-list-editor.ui @@ -108,8 +108,10 @@ True 0 - <b>Members</b> - True + Members + + + False diff --git a/calendar/gui/dialogs/alarm-dialog.ui b/calendar/gui/dialogs/alarm-dialog.ui index 21d04c1a3f..94ae8009c4 100644 --- a/calendar/gui/dialogs/alarm-dialog.ui +++ b/calendar/gui/dialogs/alarm-dialog.ui @@ -148,9 +148,8 @@ True - <b>Alarm</b> + Alarm False - True GTK_JUSTIFY_LEFT False False @@ -162,6 +161,9 @@ -1 False 0 + + + 0 @@ -307,9 +309,8 @@ True - <b>Repeat</b> + Repeat False - True GTK_JUSTIFY_LEFT False False @@ -321,6 +322,9 @@ -1 False 0 + + + 0 @@ -489,9 +493,8 @@ True - <b>Options</b> + Options False - True GTK_JUSTIFY_LEFT False False @@ -503,6 +506,9 @@ -1 False 0 + + + 0 diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui index 263221793d..be78a8f828 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.ui +++ b/calendar/gui/dialogs/cal-prefs-dialog.ui @@ -136,8 +136,10 @@ True 0 - <span weight="bold">Time</span> - True + Time + + + False @@ -361,8 +363,10 @@ True 0 - <span weight="bold">Work Week</span> - True + Work Week + + + False @@ -682,8 +686,10 @@ True 0 - <span weight="bold">Alerts</span> - True + Alerts + + + False @@ -877,8 +883,10 @@ True 0 - <span weight="bold">General</span> - True + General + + + False @@ -1031,8 +1039,10 @@ True 0 - <span weight="bold">Task List</span> - True + Task List + + + False @@ -1192,9 +1202,8 @@ True - <span weight="bold">Date/Time Format</span> + Date/Time Format False - True GTK_JUSTIFY_LEFT False False @@ -1206,6 +1215,9 @@ -1 False 0 + + + 0 @@ -1284,9 +1296,8 @@ True - <span weight="bold">Alarms</span> + Alarms False - True GTK_JUSTIFY_LEFT False False @@ -1298,6 +1309,9 @@ -1 False 0 + + + 0 @@ -1397,8 +1411,10 @@ True 0 - <span weight="bold">Default Free/Busy Server</span> - True + Default Free/Busy Server + + + False @@ -1456,9 +1472,11 @@ True - <i>%u and %d will be replaced by user and domain from the email address.</i> - True + %u and %d will be replaced by user and domain from the email address. True + + + False diff --git a/calendar/gui/dialogs/recurrence-page.ui b/calendar/gui/dialogs/recurrence-page.ui index f5f9f13524..3d1d9f723c 100644 --- a/calendar/gui/dialogs/recurrence-page.ui +++ b/calendar/gui/dialogs/recurrence-page.ui @@ -67,9 +67,8 @@ True - <b>Recurrence</b> + Recurrence False - True GTK_JUSTIFY_LEFT False False @@ -81,6 +80,9 @@ -1 False 0 + + + 0 @@ -324,9 +326,8 @@ True - <b>Exceptions</b> + Exceptions False - True GTK_JUSTIFY_LEFT False False @@ -338,6 +339,9 @@ -1 False 0 + + + 0 @@ -526,7 +530,7 @@ True - <b>Preview</b> + Preview False True GTK_JUSTIFY_CENTER @@ -540,6 +544,9 @@ -1 False 0 + + + 0 diff --git a/calendar/gui/dialogs/task-details-page.ui b/calendar/gui/dialogs/task-details-page.ui index cd82f1dce0..df6baef653 100644 --- a/calendar/gui/dialogs/task-details-page.ui +++ b/calendar/gui/dialogs/task-details-page.ui @@ -70,9 +70,8 @@ True - <span weight="bold">Status</span> + Status False - True GTK_JUSTIFY_LEFT False False @@ -84,6 +83,9 @@ -1 False 0 + + + 0 @@ -338,9 +340,8 @@ True - <span weight="bold">Miscellaneous</span> + Miscellaneous False - True GTK_JUSTIFY_LEFT False False @@ -352,6 +353,9 @@ -1 False 0 + + + 0 diff --git a/filter/filter.ui b/filter/filter.ui index d8791626da..10c293cf9c 100644 --- a/filter/filter.ui +++ b/filter/filter.ui @@ -132,9 +132,11 @@ True 0 - <b>_Filter Rules</b> - True + _Filter Rules True + + + False diff --git a/mail/mail-config.ui b/mail/mail-config.ui index df7cde0753..4be7831a89 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -109,8 +109,10 @@ True 0 - <span weight="bold">Account Information</span> - True + Account Information + + + False @@ -217,8 +219,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Required Information</span> - True + Required Information + + + False @@ -340,8 +344,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Optional Information</span> - True + Optional Information + + + False @@ -629,8 +635,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Configuration</span> - True + Configuration + + + False @@ -771,9 +779,11 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Security</span> - True + Security source_auth_dropdown + + + False @@ -860,9 +870,11 @@ ple: "Work" or "Personal" True 0 - <b>SSL is not supported in this build of Evolution</b> - True + SSL is not supported in this build of Evolution center + + + False @@ -901,10 +913,12 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">_Authentication Type</span> - True + _Authentication Type True source_auth_dropdown + + + False @@ -1111,8 +1125,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Server Configuration</span> - True + Server Configuration + + + False @@ -1222,8 +1238,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Security</span> - True + Security + + + False @@ -1308,9 +1326,11 @@ ple: "Work" or "Personal" True 0 - <b>SSL is not supported in this build of Evolution</b> - True + SSL is not supported in this build of Evolution center + + + False @@ -1347,8 +1367,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Authentication</span> - True + Authentication + + + False @@ -1544,8 +1566,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Sent and Draft Messages</span> - True + Sent and Draft Messages + + + False @@ -1729,8 +1753,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Composing Messages</span> - True + Composing Messages + + + False @@ -1929,8 +1955,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Message Receipts</span> - True + Message Receipts + + + False @@ -2015,8 +2043,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Pretty Good Privacy (PGP/GPG)</span> - True + Pretty Good Privacy (PGP/GPG) + + + False @@ -2171,8 +2201,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Secure MIME (S/MIME)</span> - True + Secure MIME (S/MIME) + + + False @@ -2604,8 +2636,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Message Fonts</span> - True + Message Fonts + + + False @@ -2754,8 +2788,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Message Display</span> - True + Message Display + + + False @@ -3094,8 +3130,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Delete Mail</span> - True + Delete Mail + + + False @@ -3225,8 +3263,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">General</span> - True + General + + + False @@ -3306,8 +3346,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Loading Images</span> - True + Loading Images + + + False @@ -3429,8 +3471,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Labels</span> - True + Labels + + + False @@ -3484,8 +3528,10 @@ ple: "Work" or "Personal" True - <b>Sender Photograph</b> - True + Sender Photograph + + + False @@ -3574,10 +3620,12 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Displayed Message _Headers</span> - True + Displayed Message _Headers True txtHeaders + + + False @@ -3698,10 +3746,12 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Date/Time Format</span> - True + Date/Time Format True txtHeaders + + + False @@ -3782,8 +3832,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">General</span> - True + General + + + False @@ -4136,8 +4188,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Default Behavior</span> - True + Default Behavior + + + False @@ -4442,8 +4496,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Alerts</span> - True + Alerts + + + False @@ -4555,9 +4611,11 @@ ple: "Work" or "Personal" True 0 - <b>Sig_natures</b> - True + Sig_natures True + + + False @@ -4591,8 +4649,10 @@ ple: "Work" or "Personal" True 0 - <b>Preview</b> - True + Preview + + + False @@ -4675,10 +4735,12 @@ ple: "Work" or "Personal" True 0 - <b>_Languages</b> - True + _Languages True listSpellCheckLanguage + + + False @@ -4812,8 +4874,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Options</span> - True + Options + + + False @@ -4945,8 +5009,10 @@ ple: "Work" or "Personal" True 0 - <span weight="bold">Printed Fonts</span> - True + Printed Fonts + + + False @@ -5291,8 +5357,10 @@ for display purposes only. True 0 - <span weight="bold">Proxy Settings</span> - True + Proxy Settings + + + 0 diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui index 2d123d6c43..3f9df5adac 100644 --- a/mail/mail-dialogs.ui +++ b/mail/mail-dialogs.ui @@ -27,8 +27,10 @@ True 0 - <span weight="bold">Digital Signature</span> - True + Digital Signature + + + False @@ -90,8 +92,10 @@ True 0 - <span weight="bold">Encryption</span> - True + Encryption + + + False @@ -669,8 +673,10 @@ elect a follow up action from the "Flag" menu. True 0 - <b>Search Folder Sources</b> - True + Search Folder Sources + + + False diff --git a/plugins/exchange-operations/exchange-oof.ui b/plugins/exchange-operations/exchange-oof.ui index f7a0ca3b53..8e4c3b3df7 100644 --- a/plugins/exchange-operations/exchange-oof.ui +++ b/plugins/exchange-operations/exchange-oof.ui @@ -281,10 +281,9 @@ Would you like to change your status to "In the Office"? True - <small>The message specified below will be automatically sent to each person who sends -mail to you while you are out of the office.</small> + The message specified below will be automatically sent to each person who sends +mail to you while you are out of the office. False - True GTK_JUSTIFY_LEFT False False @@ -292,6 +291,9 @@ mail to you while you are out of the office.</small> 0.5 0 0 + + + 0 @@ -318,9 +320,8 @@ mail to you while you are out of the office.</small> True - <b>Status:</b> + Status: False - True GTK_JUSTIFY_LEFT False False @@ -328,6 +329,9 @@ mail to you while you are out of the office.</small> 0.5 0 0 + + + 0 @@ -457,9 +461,8 @@ mail to you while you are out of the office.</small> True - <b>Out of Office Message:</b> + Out of Office Message: False - True GTK_JUSTIFY_LEFT False False @@ -467,6 +470,9 @@ mail to you while you are out of the office.</small> 0.5 0 0 + + + diff --git a/plugins/exchange-operations/exchange-permissions-dialog.ui b/plugins/exchange-operations/exchange-permissions-dialog.ui index 7433ca6393..327a7eeedf 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.ui +++ b/plugins/exchange-operations/exchange-permissions-dialog.ui @@ -150,9 +150,8 @@ True - <b>Permissions</b> + Permissions False - True GTK_JUSTIFY_LEFT False False @@ -160,6 +159,9 @@ 0.5 0 0 + + + 0 diff --git a/plugins/exchange-operations/exchange-send-options.ui b/plugins/exchange-operations/exchange-send-options.ui index edb71f8e4c..d94795d363 100644 --- a/plugins/exchange-operations/exchange-send-options.ui +++ b/plugins/exchange-operations/exchange-send-options.ui @@ -116,9 +116,8 @@ True - <b>Message Settings</b> + Message Settings False - True GTK_JUSTIFY_LEFT False False @@ -130,6 +129,9 @@ -1 False 0 + + + 0 @@ -338,9 +340,8 @@ True - <b>Tracking Options</b> + Tracking Options False - True GTK_JUSTIFY_LEFT False False @@ -352,6 +353,9 @@ -1 False 0 + + + 6 diff --git a/plugins/groupwise-features/junk-settings.ui b/plugins/groupwise-features/junk-settings.ui index bf1d6b2654..b998c90920 100644 --- a/plugins/groupwise-features/junk-settings.ui +++ b/plugins/groupwise-features/junk-settings.ui @@ -180,9 +180,8 @@ True - <b>Junk List:</b> + Junk List: False - True GTK_JUSTIFY_LEFT False False @@ -194,6 +193,9 @@ -1 False 0 + + + 6 diff --git a/plugins/groupwise-features/proxy-add-dialog.ui b/plugins/groupwise-features/proxy-add-dialog.ui index c0e09ef421..e1050f4f4f 100644 --- a/plugins/groupwise-features/proxy-add-dialog.ui +++ b/plugins/groupwise-features/proxy-add-dialog.ui @@ -230,9 +230,8 @@ True - <b>Name</b> + Name False - True GTK_JUSTIFY_LEFT False False @@ -244,6 +243,9 @@ -1 False 0 + + + diff --git a/plugins/imap-features/imap-headers.ui b/plugins/imap-features/imap-headers.ui index 8d3d60e7b7..4a1991252e 100644 --- a/plugins/imap-features/imap-headers.ui +++ b/plugins/imap-features/imap-headers.ui @@ -119,9 +119,8 @@ this if you do not have filters based on mailing lists True - <b>IMAP Headers</b> + IMAP Headers False - True GTK_JUSTIFY_LEFT False True @@ -133,6 +132,9 @@ this if you do not have filters based on mailing lists -1 False 0 + + + @@ -300,9 +302,8 @@ can ignore this if you choose "All Headers". True - <b>Custom Headers</b> + Custom Headers False - True GTK_JUSTIFY_LEFT False True @@ -314,6 +315,9 @@ can ignore this if you choose "All Headers". -1 False 0 + + + diff --git a/plugins/publish-calendar/publish-calendar.ui b/plugins/publish-calendar/publish-calendar.ui index f60bc9090b..aedb323ad6 100644 --- a/plugins/publish-calendar/publish-calendar.ui +++ b/plugins/publish-calendar/publish-calendar.ui @@ -100,8 +100,10 @@ True 0 - <span weight="bold">General</span> - True + General + + + False @@ -266,8 +268,10 @@ True 0 - <span weight="bold">Sources</span> - True + Sources + + + False @@ -330,8 +334,10 @@ True 0 - <span weight="bold">Location</span> - True + Location + + + False @@ -482,8 +488,10 @@ True 0 - <span weight="bold">Optional Information</span> - True + Optional Information + + + False diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui index 42be5f47a2..7eddf6a8c6 100644 --- a/smime/gui/smime-ui.ui +++ b/smime/gui/smime-ui.ui @@ -186,9 +186,8 @@ True - <b>This certificate has been verified for the following uses:</b> + This certificate has been verified for the following uses: False - True GTK_JUSTIFY_LEFT False False @@ -200,6 +199,9 @@ -1 False 0 + + + @@ -231,9 +233,8 @@ True - <b>Issued To</b> + Issued To False - True GTK_JUSTIFY_LEFT False False @@ -245,6 +246,9 @@ -1 False 0 + + + 0 @@ -501,9 +505,8 @@ True - <b>Issued By</b> + Issued By False - True GTK_JUSTIFY_LEFT False False @@ -515,6 +518,9 @@ -1 False 0 + + + 0 @@ -528,9 +534,8 @@ True - <b>Fingerprints</b> + Fingerprints False - True GTK_JUSTIFY_LEFT False False @@ -542,6 +547,9 @@ -1 False 0 + + + 0 @@ -917,9 +925,8 @@ True - <b>Validity</b> + Validity False - True GTK_JUSTIFY_LEFT False False @@ -931,6 +938,9 @@ -1 False 0 + + + 0 @@ -1012,9 +1022,8 @@ True - <b>Certificate Hierarchy</b> + Certificate Hierarchy False - True GTK_JUSTIFY_LEFT False False @@ -1026,6 +1035,9 @@ -1 False 0 + + + @@ -1068,9 +1080,8 @@ True - <b>Certificate Fields</b> + Certificate Fields False - True GTK_JUSTIFY_LEFT False False @@ -1082,6 +1093,9 @@ -1 False 0 + + + @@ -1129,9 +1143,8 @@ True - <b>Field Value</b> + Field Value False - True GTK_JUSTIFY_LEFT False False @@ -1143,6 +1156,9 @@ -1 False 0 + + + diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.ui b/widgets/e-timezone-dialog/e-timezone-dialog.ui index 7ce81a176c..a02ec00f1c 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.ui +++ b/widgets/e-timezone-dialog/e-timezone-dialog.ui @@ -114,9 +114,8 @@ Use the right mouse button to zoom out. True - <b>Time Zones</b> + Time Zones False - True GTK_JUSTIFY_LEFT False False @@ -124,6 +123,9 @@ Use the right mouse button to zoom out. 0.5 0 0 + + + 0 @@ -216,9 +218,8 @@ Use the right mouse button to zoom out. True - <b>_Selection</b> + _Selection True - True GTK_JUSTIFY_CENTER False False @@ -227,6 +228,9 @@ Use the right mouse button to zoom out. 0 0 timezone-combo + + + 0 diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui index e43eb52eef..d02393b82f 100644 --- a/widgets/misc/e-send-options.ui +++ b/widgets/misc/e-send-options.ui @@ -270,8 +270,10 @@ True - <b>Replies</b> - True + Replies + + + @@ -456,8 +458,10 @@ True - <b>Delivery Options</b> - True + Delivery Options + + + @@ -678,9 +682,11 @@ True - <b>Status Tracking</b> - True + Status Tracking True + + + @@ -845,9 +851,11 @@ True - <b>Return Notification</b> - True + Return Notification True + + + -- cgit v1.2.3