From 53db149b124ec1ae6ec753a9f571f85c598d4dd4 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 2 May 2013 21:28:47 +0100 Subject: [PATCH] Replace Markup with gtkbuilder atttributes for simpler translation labels --- .../glade/add_torrent_dialog.infohash.ui | 6 +- deluge/ui/gtkui/glade/add_torrent_dialog.ui | 36 ++- .../ui/gtkui/glade/add_torrent_dialog.url.ui | 6 +- deluge/ui/gtkui/glade/connect_peer_dialog.ui | 6 +- deluge/ui/gtkui/glade/connection_manager.ui | 7 +- .../create_torrent_dialog.remote_path.ui | 6 +- .../create_torrent_dialog.remote_save.ui | 6 +- .../ui/gtkui/glade/create_torrent_dialog.ui | 13 +- deluge/ui/gtkui/glade/edit_trackers.add.ui | 6 +- deluge/ui/gtkui/glade/edit_trackers.edit.ui | 6 +- deluge/ui/gtkui/glade/edit_trackers.ui | 7 +- .../gtkui/glade/main_window.move_storage.ui | 19 +- .../ui/gtkui/glade/main_window.new_release.ui | 25 +- deluge/ui/gtkui/glade/main_window.tabs.ui | 186 +++++++---- deluge/ui/gtkui/glade/move_storage_dialog.ui | 6 +- deluge/ui/gtkui/glade/preferences_dialog.ui | 290 ++++++++++++------ deluge/ui/gtkui/glade/queuedtorrents.ui | 7 +- .../ui/gtkui/glade/remove_torrent_dialog.ui | 7 +- 18 files changed, 439 insertions(+), 206 deletions(-) diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui index b0401a5bf..200ea5809 100644 --- a/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui +++ b/deluge/ui/gtkui/glade/add_torrent_dialog.infohash.ui @@ -87,8 +87,10 @@ True False - <b>From Infohash</b> - True + From Infohash + + + False diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.ui index c83a228da..e7c85d3d5 100644 --- a/deluge/ui/gtkui/glade/add_torrent_dialog.ui +++ b/deluge/ui/gtkui/glade/add_torrent_dialog.ui @@ -266,8 +266,10 @@ True - <b>Torrents</b> - True + Torrents + + + @@ -373,8 +375,10 @@ True - <b>Download Location</b> - True + Download Location + + + @@ -442,8 +446,10 @@ True - <b>Move Complete Location</b> - True + Move Complete Location + + + @@ -509,8 +515,10 @@ True - <b>Allocation</b> - True + Allocation + + + @@ -664,8 +672,10 @@ True - <b>Bandwidth</b> - True + Bandwidth + + + @@ -745,8 +755,10 @@ used sparingly. True - <b>General</b> - True + General + + + diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui b/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui index 829712880..8aa12e3dd 100644 --- a/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui +++ b/deluge/ui/gtkui/glade/add_torrent_dialog.url.ui @@ -87,8 +87,10 @@ True False - <b>From URL</b> - True + From URL + + + False diff --git a/deluge/ui/gtkui/glade/connect_peer_dialog.ui b/deluge/ui/gtkui/glade/connect_peer_dialog.ui index 7f2984480..33e33d8de 100644 --- a/deluge/ui/gtkui/glade/connect_peer_dialog.ui +++ b/deluge/ui/gtkui/glade/connect_peer_dialog.ui @@ -88,8 +88,10 @@ True False 0 - <b>Add Peer</b> - True + Add Peer + + + True diff --git a/deluge/ui/gtkui/glade/connection_manager.ui b/deluge/ui/gtkui/glade/connection_manager.ui index 463c58e55..15c7586ef 100644 --- a/deluge/ui/gtkui/glade/connection_manager.ui +++ b/deluge/ui/gtkui/glade/connection_manager.ui @@ -53,8 +53,11 @@ True False - <big><b>Connection Manager</b></big> - True + Connection Manager + + + + False diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui index 1cf8cf5ed..92b23cfca 100644 --- a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui +++ b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_path.ui @@ -87,8 +87,10 @@ True False - <b>Remote Path</b> - True + Remote Path + + + False diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui index 80ba279d4..56460f119 100644 --- a/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui +++ b/deluge/ui/gtkui/glade/create_torrent_dialog.remote_save.ui @@ -87,8 +87,10 @@ True False - <b>Save .torrent file</b> - True + Save .torrent file + + + False diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.ui b/deluge/ui/gtkui/glade/create_torrent_dialog.ui index f17ba0d93..d029dbcd1 100644 --- a/deluge/ui/gtkui/glade/create_torrent_dialog.ui +++ b/deluge/ui/gtkui/glade/create_torrent_dialog.ui @@ -34,8 +34,11 @@ True False - <big><b>Create Torrent</b></big> - True + Create Torrent + + + + False @@ -259,8 +262,10 @@ True False - <b>Files</b> - True + Files + + + diff --git a/deluge/ui/gtkui/glade/edit_trackers.add.ui b/deluge/ui/gtkui/glade/edit_trackers.add.ui index 967c3804c..ad80bdfd3 100644 --- a/deluge/ui/gtkui/glade/edit_trackers.add.ui +++ b/deluge/ui/gtkui/glade/edit_trackers.add.ui @@ -90,8 +90,10 @@ True False - <b>Add Trackers</b> - True + Add Trackers + + + False diff --git a/deluge/ui/gtkui/glade/edit_trackers.edit.ui b/deluge/ui/gtkui/glade/edit_trackers.edit.ui index 8ba4748d4..ff708e7e7 100644 --- a/deluge/ui/gtkui/glade/edit_trackers.edit.ui +++ b/deluge/ui/gtkui/glade/edit_trackers.edit.ui @@ -89,8 +89,10 @@ True False - <b>Edit Tracker</b> - True + Edit Tracker + + + False diff --git a/deluge/ui/gtkui/glade/edit_trackers.ui b/deluge/ui/gtkui/glade/edit_trackers.ui index 794d607b9..f79958122 100644 --- a/deluge/ui/gtkui/glade/edit_trackers.ui +++ b/deluge/ui/gtkui/glade/edit_trackers.ui @@ -87,8 +87,11 @@ False 0.05000000074505806 10 - <big><b>Edit Trackers</b></big> - True + Edit Trackers + + + + False diff --git a/deluge/ui/gtkui/glade/main_window.move_storage.ui b/deluge/ui/gtkui/glade/main_window.move_storage.ui index 7533b7862..ab996743a 100644 --- a/deluge/ui/gtkui/glade/main_window.move_storage.ui +++ b/deluge/ui/gtkui/glade/main_window.move_storage.ui @@ -83,8 +83,11 @@ True False - <big><b>Are you sure you want to remove the selected torrent?</b></big> - True + Are you sure you want to remove the selected torrent? + + + + True @@ -136,8 +139,10 @@ True False 0 - <i>The associated .torrent will be deleted!</i> - True + The associated .torrent will be deleted! + + + True @@ -180,8 +185,10 @@ True False 0 - <i>The downloaded data will be deleted!</i> - True + The downloaded data will be deleted! + + + True diff --git a/deluge/ui/gtkui/glade/main_window.new_release.ui b/deluge/ui/gtkui/glade/main_window.new_release.ui index 0de1ab3f0..0830c2661 100644 --- a/deluge/ui/gtkui/glade/main_window.new_release.ui +++ b/deluge/ui/gtkui/glade/main_window.new_release.ui @@ -84,8 +84,11 @@ True False - <b><big>New Release Available!</big></b> - True + New Release Available! + + + + False @@ -142,8 +145,10 @@ True False 0 - <i>Available Version:</i> - True + Available Version: + + + 2 @@ -167,8 +172,10 @@ True False 0 - <i>Current Version:</i> - True + Current Version: + + + GTK_FILL @@ -178,8 +185,10 @@ False 0 - <i>Server Version</i> - True + Server Version + + + 1 diff --git a/deluge/ui/gtkui/glade/main_window.tabs.ui b/deluge/ui/gtkui/glade/main_window.tabs.ui index ce5521ce0..4b38cbbcb 100644 --- a/deluge/ui/gtkui/glade/main_window.tabs.ui +++ b/deluge/ui/gtkui/glade/main_window.tabs.ui @@ -121,8 +121,10 @@ True False 0 - <b>Auto Managed:</b> - True + Auto Managed: + + + 4 @@ -165,8 +167,10 @@ True False 0 - <b>Seed Rank:</b> - True + Seed Rank: + + + 6 @@ -181,8 +185,10 @@ True False 0 - <b>Seeding Time:</b> - True + Seeding Time: + + + 6 @@ -209,8 +215,10 @@ True False 0 - <b>Active Time:</b> - True + Active Time: + + + 6 @@ -270,8 +278,10 @@ False 0 0 - <b>Tracker Status:</b> - True + Tracker Status: + + + 4 @@ -303,8 +313,10 @@ False 0 0 - <b>Last Seen Complete:</b> - True + Last Seen Complete: + + + 4 @@ -337,8 +349,10 @@ False 0 1 - <b>Availability:</b> - True + Availability: + + + 4 @@ -395,8 +409,10 @@ True False 0 - <b>Peers:</b> - True + Peers: + + + 4 @@ -423,8 +439,10 @@ True False 0 - <b>Seeders:</b> - True + Seeders: + + + 4 @@ -443,8 +461,10 @@ True False 0 - <b>Pieces:</b> - True + Pieces: + + + @@ -467,8 +487,10 @@ True False 0 - <b>ETA:</b> - True + ETA: + + + @@ -491,8 +513,10 @@ True False 0 - <b>Up Speed:</b> - True + Up Speed: + + + @@ -515,8 +539,10 @@ True False 0 - <b>Down Speed:</b> - True + Down Speed: + + + @@ -536,8 +562,10 @@ True False 0 - <b>Next Announce:</b> - True + Next Announce: + + + @@ -557,8 +585,10 @@ True False 0 - <b>Share Ratio:</b> - True + Share Ratio: + + + @@ -578,8 +608,10 @@ True False 0 - <b>Uploaded:</b> - True + Uploaded: + + + @@ -599,8 +631,10 @@ True False 0 - <b>Downloaded:</b> - True + Downloaded: + + + @@ -665,8 +699,10 @@ True False 0 - <b>Date Added:</b> - True + Date Added: + + + 6 @@ -790,8 +826,10 @@ False 0 1 - <b>Comments:</b> - True + Comments: + + + 5 @@ -821,8 +859,10 @@ False 0 1 - <b># of files:</b> - True + # of files: + + + 4 @@ -853,8 +893,10 @@ True False 0 - <b>Hash:</b> - True + Hash: + + + 1 @@ -885,8 +927,10 @@ False 0 1 - <b>Tracker:</b> - True + Tracker: + + + 7 @@ -906,8 +950,10 @@ False 0 1 - <b>Total Size:</b> - True + Total Size: + + + @@ -945,8 +991,10 @@ 0 0 1 - <b>Name:</b> - True + Name: + + + @@ -965,8 +1013,10 @@ True False 0 - <b>Path:</b> - True + Path: + + + @@ -1000,8 +1050,10 @@ False 0 1 - <b>Status:</b> - True + Status: + + + 6 @@ -1046,8 +1098,10 @@ False 0 1 - <b>Owner:</b> - True + Owner: + + + 8 @@ -1062,8 +1116,10 @@ False 0 1 - <b>Shared:</b> - True + Shared: + + + 9 @@ -1519,8 +1575,10 @@ True False - <b>Bandwidth</b> - True + Bandwidth + + + @@ -1714,8 +1772,10 @@ True False - <b>Queue</b> - True + Queue + + + @@ -1868,8 +1928,10 @@ True False - <b>General</b> - True + General + + + diff --git a/deluge/ui/gtkui/glade/move_storage_dialog.ui b/deluge/ui/gtkui/glade/move_storage_dialog.ui index b457e7ebd..cf505b751 100644 --- a/deluge/ui/gtkui/glade/move_storage_dialog.ui +++ b/deluge/ui/gtkui/glade/move_storage_dialog.ui @@ -86,8 +86,10 @@ True False - <b>Move Storage</b> - True + Move Storage + + + False diff --git a/deluge/ui/gtkui/glade/preferences_dialog.ui b/deluge/ui/gtkui/glade/preferences_dialog.ui index 5dcbf5cf1..312fa335e 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.ui +++ b/deluge/ui/gtkui/glade/preferences_dialog.ui @@ -447,8 +447,12 @@ 0 10 10 - <b><i><big>Downloads</big></i></b> - True + Downloads + + + + + False @@ -689,8 +693,10 @@ True False - <b>Folders</b> - True + Folders + + + @@ -763,8 +769,10 @@ True False - <b>Allocation</b> - True + Allocation + + + @@ -852,8 +860,10 @@ used sparingly. True False - <b>Options</b> - True + Options + + + @@ -903,8 +913,12 @@ used sparingly. 0 10 10 - <b><i><big>Network</big></i></b> - True + Network + + + + + False @@ -1137,8 +1151,10 @@ used sparingly. True False - <b>Incoming Ports</b> - True + Incoming Ports + + + @@ -1272,8 +1288,10 @@ used sparingly. True False - <b>Outgoing Ports</b> - True + Outgoing Ports + + + @@ -1331,8 +1349,10 @@ used sparingly. True False - <b>Interface</b> - True + Interface + + + @@ -1410,8 +1430,10 @@ used sparingly. True False - <b>TOS</b> - True + TOS + + + @@ -1540,8 +1562,10 @@ used sparingly. True False - <b>Network Extras</b> - True + Network Extras + + + @@ -1732,8 +1756,10 @@ used sparingly. True False - <b>Encryption</b> - True + Encryption + + + @@ -1787,8 +1813,12 @@ used sparingly. 0 10 10 - <b><i><big>Bandwidth</big></i></b> - True + Bandwidth + + + + + False @@ -2112,8 +2142,10 @@ used sparingly. True False - <b>Global Bandwidth Usage</b> - True + Global Bandwidth Usage + + + @@ -2295,8 +2327,10 @@ used sparingly. True False - <b>Per Torrent Bandwidth Usage</b> - True + Per Torrent Bandwidth Usage + + + @@ -2350,8 +2384,12 @@ used sparingly. 0 10 10 - <i><b><big>Interface</big></b></i> - True + Interface + + + + + False @@ -2400,8 +2438,10 @@ used sparingly. True False - <b>Classic Mode</b> - True + Classic Mode + + + @@ -2733,8 +2773,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Main Window</b> - True + Main Window + + + @@ -2807,8 +2849,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Add Torrents Dialog</b> - True + Add Torrents Dialog + + + @@ -3012,8 +3056,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>System Tray</b> - True + System Tray + + + @@ -3067,8 +3113,12 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <i><b><big>Other</big></b></i> - True + Other + + + + + False @@ -3133,8 +3183,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Updates</b> - True + Updates + + + @@ -3206,8 +3258,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>System Information</b> - True + System Information + + + @@ -3290,8 +3344,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>GeoIP Database</b> - True + GeoIP Database + + + @@ -3409,8 +3465,12 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <i><b><big>Daemon</big></b></i> - True + Daemon + + + + + False @@ -3494,8 +3554,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Port</b> - True + Port + + + @@ -3534,8 +3596,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Connections</b> - True + Connections + + + @@ -3574,8 +3638,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Other</b> - True + Other + + + @@ -3688,8 +3754,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <b>Accounts</b> - True + Accounts + + + @@ -3742,8 +3810,12 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <i><b><big>Queue</big></b></i> - True + Queue + + + + + False @@ -3806,8 +3878,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>General</b> - True + General + + + @@ -3984,8 +4058,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Active Torrents</b> - True + Active Torrents + + + @@ -4202,8 +4278,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Seeding</b> - True + Seeding + + + @@ -4264,8 +4342,12 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <i><b><big>Proxy</big></b></i> - True + Proxy + + + + + False @@ -4481,8 +4563,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Peer</b> - True + Peer + + + @@ -4684,8 +4768,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Web Seed</b> - True + Web Seed + + + @@ -4887,8 +4973,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Tracker</b> - True + Tracker + + + @@ -5094,8 +5182,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>DHT</b> - True + DHT + + + @@ -5148,8 +5238,12 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <b><i><big>Cache</big></i></b> - True + Cache + + + + + False @@ -5273,8 +5367,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Settings</b> - True + Settings + + + @@ -5407,8 +5503,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Write</b> - True + Write + + + @@ -5552,8 +5650,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Read</b> - True + Read + + + @@ -5640,8 +5740,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Size</b> - True + Size + + + @@ -5687,8 +5789,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Status</b> - True + Status + + + @@ -5743,8 +5847,12 @@ status tab (<b>EXPERIMENTAL!!!</b>) 0 10 10 - <i><b><big>Plugins</big></b></i> - True + Plugins + + + + + False @@ -5961,8 +6069,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) True False - <b>Info</b> - True + Info + + + diff --git a/deluge/ui/gtkui/glade/queuedtorrents.ui b/deluge/ui/gtkui/glade/queuedtorrents.ui index 7a09d8d58..01a003bc7 100644 --- a/deluge/ui/gtkui/glade/queuedtorrents.ui +++ b/deluge/ui/gtkui/glade/queuedtorrents.ui @@ -94,8 +94,11 @@ False 0.05000000074505806 10 - <big><b>Add Queued Torrents</b></big> - True + Add Queued Torrents + + + + False diff --git a/deluge/ui/gtkui/glade/remove_torrent_dialog.ui b/deluge/ui/gtkui/glade/remove_torrent_dialog.ui index f8b714c12..b3a8fd495 100644 --- a/deluge/ui/gtkui/glade/remove_torrent_dialog.ui +++ b/deluge/ui/gtkui/glade/remove_torrent_dialog.ui @@ -44,8 +44,11 @@ True False 0 - <big><b>Remove the selected torrent?</b></big> - True + Remove the selected torrent? + + + + True