LinuxDC++

Merge lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n into lp:linuxdcpp

  1. linuxdcpp-i18n
  2. Merge into trunk
Proposed by Steven Sheehy
Status: Merged
Approved by: Steven Sheehy
Approved revision: 416
Merged at revision: 406
Proposed branch: lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
Merge into: lp:linuxdcpp
Diff against target: 7135 lines (+1998/-2251)
48 files modified
.bzrignore (+1/-0)
Readme.txt (+1/-1)
SConstruct (+75/-36)
dcpp/DCPlusPlus.cpp (+5/-7)
dcpp/SConscript (+4/-4)
dcpp/Util.cpp (+10/-5)
dcpp/Util.h (+2/-1)
glade/SConscript (+10/-0)
glade/favoritehubs.glade (+10/-1)
glade/favoriteusers.glade (+5/-4)
glade/hash.glade (+1/-1)
glade/hub.glade (+2/-3)
glade/mainwindow.glade (+31/-68)
glade/publichubs.glade (+1/-1)
glade/search.glade (+6/-4)
glade/settingsdialog.glade (+1286/-1514)
glade/sharebrowser.glade (+12/-11)
glade/transfers.glade (+1/-1)
linux/IntlUtil.hh (+64/-0)
linux/SConscript (+7/-6)
linux/WulforUtil.cc (+21/-21)
linux/bookentry.cc (+1/-0)
linux/downloadqueue.cc (+25/-24)
linux/downloadqueue.hh (+2/-0)
linux/entry.hh (+1/-1)
linux/favoritehubs.cc (+12/-18)
linux/favoriteusers.cc (+29/-29)
linux/finishedtransfers.cc (+9/-8)
linux/hashdialog.cc (+14/-6)
linux/hub.cc (+31/-27)
linux/hub.hh (+1/-0)
linux/mainwindow.cc (+12/-11)
linux/mainwindow.hh (+2/-0)
linux/privatemessage.cc (+3/-3)
linux/publichubs.cc (+16/-16)
linux/search.cc (+36/-26)
linux/search.hh (+1/-0)
linux/settingsdialog.cc (+86/-224)
linux/settingsdialog.hh (+1/-8)
linux/settingsmanager.hh (+1/-0)
linux/sharebrowser.cc (+24/-29)
linux/sharebrowser.hh (+2/-0)
linux/transfers.cc (+37/-30)
linux/transfers.hh (+2/-0)
linux/treeview.cc (+69/-67)
linux/treeview.hh (+2/-3)
linux/wulfor.cc (+24/-31)
linux/wulformanager.cc (+0/-1)
To merge this branch: bzr merge lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
Reviewer Review Type Date Requested Status
Razzloss Approve
Review via email: mp+47355@code.launchpad.net

Commit message

Merge i18n branch

To post a comment you must log in.
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n updated
416. By Steven Sheehy

Fix build order

Revision history for this message
Razzloss (razzloss) wrote :

I don't see any reason not to merge. The few issues discussed via email are not critical and can be left as is or fixed/changed after the merge. And since there's nothing going on in the main branch there's no reason why the work couldn't continue on there (we might even get some user feedback after it gets pushed to the PPA).

--RZ

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-03-24 00:41:52 +0000
+++ .bzrignore 2011-01-25 05:38:26 +0000
@@ -2,3 +2,4 @@
2tags2tags
3core3core
4linuxdcpp4linuxdcpp
5po
56
=== modified file 'Readme.txt'
--- Readme.txt 2010-11-05 13:09:29 +0000
+++ Readme.txt 2011-01-25 05:38:26 +0000
@@ -20,7 +20,7 @@
20scons >= 0.9620scons >= 0.96
21pkg-config21pkg-config
22g++ >= 4.122g++ >= 4.1
23gtk+-2.0 >= 2.1023gtk+-2.0 >= 2.12
24gthread-2.0 >= 2.424gthread-2.0 >= 2.4
25libglade-2.0 >= 2.425libglade-2.0 >= 2.4
26pthread26pthread
2727
=== modified file 'SConstruct'
--- SConstruct 2011-01-18 15:02:04 +0000
+++ SConstruct 2011-01-25 05:38:26 +0000
@@ -12,13 +12,14 @@
1212
13EnsureSConsVersion(0, 98, 1)13EnsureSConsVersion(0, 98, 1)
1414
15APP_NAME = 'linuxdcpp'15PACKAGE = 'linuxdcpp'
16CORE_PACKAGE = 'libdcpp'
16BUILD_PATH = '#/build/'17BUILD_PATH = '#/build/'
18BUILD_LOCALE_PATH = BUILD_PATH + 'locale/'
1719
18# todo: remove -fpermissive and fix the errors
19BUILD_FLAGS = {20BUILD_FLAGS = {
20 'common': ['-I#', '-fpermissive', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],21 'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
21 'debug': ['-g', '-ggdb', '-Wall', '-D_DEBUG'], 22 'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'],
22 'release' : ['-O3', '-fomit-frame-pointer', '-DNDEBUG']23 'release' : ['-O3', '-fomit-frame-pointer', '-DNDEBUG']
23}24}
2425
@@ -67,21 +68,29 @@
67 context.Result(revision)68 context.Result(revision)
68 return revision69 return revision
6970
70# Install app icons to share/icons and all others to share/linuxdcpp/icons71# Recursively installs all files within the source folder to target. Optionally,
71def install_icons(env, icons_dir):72# a filter function can be provided to prevent installation of certain files.
72 prefix = env['FAKE_ROOT'] + os.path.join(env['PREFIX'], 'share')73def recursive_install(env, source, target, filter = None):
7374 nodes = env.Glob(os.path.join(source, '*'))
74 for root, dirs, files in os.walk(icons_dir):75 target = os.path.join(target, os.path.basename(source))
75 for file in files:76
76 (filename, ext) = file.rsplit('.', 1)77 for node in nodes:
7778 if node.isdir():
78 if (filename == APP_NAME):79 env.RecursiveInstall(str(node), target, filter)
79 target = os.path.join(prefix, root)80 elif filter == None or filter(node.name):
80 else:81 env.Alias('install', env.Install(target, node))
81 target = os.path.join(prefix, APP_NAME, root)82
8283def generate_message_catalogs(env):
83 src = os.path.join(root, file)84 mo_path = os.path.join(BUILD_LOCALE_PATH, '%s', 'LC_MESSAGES', env['package'] + '.mo')
84 env.Alias('install', env.Install(dir = target, source = src))85 po_files = env.Glob('po/*.po', strings = True)
86
87 for po_file in po_files:
88 basename = os.path.basename(po_file)
89 lang = os.path.splitext(basename)[0]
90 mo_file = mo_path % lang
91 env.MoBuild(source = po_file, target = mo_file)
92
93 return None
8594
8695
87# ----------------------------------------------------------------------96# ----------------------------------------------------------------------
@@ -107,7 +116,7 @@
107# Initialization116# Initialization
108# ----------------------------------------------------------------------117# ----------------------------------------------------------------------
109118
110env = Environment(ENV = os.environ, options = vars)119env = Environment(ENV = os.environ, variables = vars, package = PACKAGE)
111120
112env['mode'] = 'debug' if env.get('debug') else 'release'121env['mode'] = 'debug' if env.get('debug') else 'release'
113env['build_path'] = BUILD_PATH + env['mode'] + '/'122env['build_path'] = BUILD_PATH + env['mode'] + '/'
@@ -136,7 +145,26 @@
136vars.Save('build/sconf/scache.conf', env)145vars.Save('build/sconf/scache.conf', env)
137Help(vars.GenerateHelpText(env))146Help(vars.GenerateHelpText(env))
138147
139env.AddMethod(install_icons, 'InstallIcons')148pot_args = ['xgettext', '--default-domain=$PACKAGE', '--package-name=$PACKAGE',
149 '--msgid-bugs-address=https://translations.launchpad.net/linuxdcpp',
150 '--copyright-holder=LinuxDC++ Team', '--add-comments=TRANSLATORS',
151 '--keyword=_', '--keyword=N_', '--keyword=C_:1c,2', '--keyword=F_',
152 '--keyword=P_:1,2', '--from-code=UTF-8', '--foreign-user',
153 '--no-wrap', '--boost', '--sort-output', '--language=$LANGUAGE',
154 '--output=$TARGET', '$SOURCES']
155pot_build = Builder(action = Action([pot_args], 'Extracting messages to $TARGET from $SOURCES'))
156env.Append(BUILDERS = {'PotBuild' : pot_build})
157
158merge_pot_args = ['msgcat', '$SOURCES', '--output-file=$TARGET']
159merge_pot_builder = Builder(action = Action([merge_pot_args], 'Merging pot files $SOURCES to $TARGET'))
160env.Append(BUILDERS = {'MergePotFiles' : merge_pot_builder})
161
162mo_args = ['msgfmt', '-c', '-o', '$TARGET', '$SOURCE']
163mo_build = Builder(action = Action([mo_args], 'Compiling message catalog $TARGET from $SOURCES'))
164env.Append(BUILDERS = {'MoBuild' : mo_build})
165
166env.AddMethod(generate_message_catalogs, 'GenerateMessageCatalogs')
167env.AddMethod(recursive_install, 'RecursiveInstall')
140168
141conf = env.Configure(169conf = env.Configure(
142 custom_tests =170 custom_tests =
@@ -164,8 +192,8 @@
164 print '\tpkg-config not found.'192 print '\tpkg-config not found.'
165 Exit(1)193 Exit(1)
166194
167 if not conf.CheckPKG('gtk+-2.0 >= 2.10'):195 if not conf.CheckPKG('gtk+-2.0 >= 2.12'):
168 print '\tgtk+ >= 2.10 not found.'196 print '\tgtk+ >= 2.12 not found.'
169 print '\tNote: You might have the lib but not the headers'197 print '\tNote: You might have the lib but not the headers'
170 Exit(1)198 Exit(1)
171199
@@ -255,7 +283,7 @@
255 env.ParseConfig('pkg-config --libs libglade-2.0')283 env.ParseConfig('pkg-config --libs libglade-2.0')
256 env.ParseConfig('pkg-config --libs gthread-2.0')284 env.ParseConfig('pkg-config --libs gthread-2.0')
257285
258 env.Append(LIBPATH = env['build_path'] + 'dcpp')286 env.Append(LIBPATH = env['build_path'] + CORE_PACKAGE)
259 env.Prepend(LIBS = 'dcpp')287 env.Prepend(LIBS = 'dcpp')
260288
261 if os.sys.platform == 'linux2':289 if os.sys.platform == 'linux2':
@@ -281,17 +309,23 @@
281# Build309# Build
282# ----------------------------------------------------------------------310# ----------------------------------------------------------------------
283311
284 Export('env')
285
286 # Build the dcpp library312 # Build the dcpp library
287 libdcpp = SConscript(dirs = 'dcpp', variant_dir = env['build_path'] + 'dcpp', duplicate = 0)313 dcpp_env = env.Clone(package = CORE_PACKAGE)
314 libdcpp = SConscript(dirs = 'dcpp', variant_dir = env['build_path'] + CORE_PACKAGE, duplicate = 0, exports = {'env': dcpp_env})
288315
289 # Build the GUI316 # Build the GUI
290 obj_files = SConscript(dirs = 'linux', variant_dir = env['build_path'] + 'gui', duplicate = 0)317 ui_env = env.Clone()
318 glade_pot_file = SConscript(dirs = 'glade', variant_dir = env['build_path'] + 'glade', duplicate = 0, exports = {'env': ui_env})
319
320 (linux_pot_file, obj_files) = SConscript(dirs = 'linux', variant_dir = env['build_path'] + 'gui', duplicate = 0, exports = {'env': ui_env})
291321
292 # Create the executable322 # Create the executable
293 env.Program(target = APP_NAME, source = [libdcpp, obj_files])323 env.Program(target = PACKAGE, source = [libdcpp, obj_files])
294 Default(APP_NAME)324
325 # i18n
326 env.MergePotFiles(source = [glade_pot_file, linux_pot_file], target = 'po/%s.pot' % PACKAGE)
327 env.GenerateMessageCatalogs()
328 Default(PACKAGE)
295329
296330
297# ----------------------------------------------------------------------331# ----------------------------------------------------------------------
@@ -303,11 +337,16 @@
303 glade_files = env.Glob('glade/*.glade')337 glade_files = env.Glob('glade/*.glade')
304 text_files = env.Glob('*.txt')338 text_files = env.Glob('*.txt')
305 prefix = env['FAKE_ROOT'] + env['PREFIX']339 prefix = env['FAKE_ROOT'] + env['PREFIX']
306 desktop_file = os.path.join('data', APP_NAME + '.desktop')340 desktop_file = os.path.join('data', PACKAGE + '.desktop')
307341 app_icon_filter = lambda icon: os.path.splitext(icon)[0] == PACKAGE
308 env.InstallIcons('icons/hicolor/')342 regular_icon_filter = lambda icon: os.path.splitext(icon)[0] != PACKAGE
309 env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', APP_NAME, 'glade'), source = glade_files))343
310 env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'doc', APP_NAME), source = text_files))344 env.RecursiveInstall('icons/hicolor', os.path.join(prefix, 'share', 'icons'), app_icon_filter)
345 env.RecursiveInstall('icons/hicolor', os.path.join(prefix, 'share', PACKAGE, 'icons'), regular_icon_filter)
346 env.RecursiveInstall(BUILD_LOCALE_PATH, os.path.join(prefix, 'share', 'locale'))
347
348 env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', PACKAGE, 'glade'), source = glade_files))
349 env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'doc', PACKAGE), source = text_files))
311 env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'applications'), source = desktop_file))350 env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'applications'), source = desktop_file))
312 env.Alias('install', env.Install(dir = os.path.join(prefix, 'bin'), source = APP_NAME))351 env.Alias('install', env.Install(dir = os.path.join(prefix, 'bin'), source = PACKAGE))
313352
314353
=== modified file 'dcpp/DCPlusPlus.cpp'
--- dcpp/DCPlusPlus.cpp 2009-08-15 04:40:26 +0000
+++ dcpp/DCPlusPlus.cpp 2011-01-25 05:38:26 +0000
@@ -59,9 +59,8 @@
59 WSAStartup(MAKEWORD(2, 2), &wsaData);59 WSAStartup(MAKEWORD(2, 2), &wsaData);
60#endif60#endif
6161
62 Util::initialize();
63
64 bindtextdomain(PACKAGE, LOCALEDIR);62 bindtextdomain(PACKAGE, LOCALEDIR);
63 bind_textdomain_codeset(PACKAGE, "UTF-8");
6564
66 ResourceManager::newInstance();65 ResourceManager::newInstance();
67 SettingsManager::newInstance();66 SettingsManager::newInstance();
@@ -83,16 +82,15 @@
8382
84 SettingsManager::getInstance()->load();83 SettingsManager::getInstance()->load();
8584
85#ifdef _WIN32
86 if(!SETTING(LANGUAGE).empty()) {86 if(!SETTING(LANGUAGE).empty()) {
87#ifdef _WIN32
88 string language = "LANGUAGE=" + SETTING(LANGUAGE);87 string language = "LANGUAGE=" + SETTING(LANGUAGE);
89 putenv(language.c_str());88 putenv(language.c_str());
90#else89
91 setenv("LANGUAGE", SETTING(LANGUAGE).c_str(), true);90 // Apparently this is supposed to make gettext reload the message catalog...
92#endif
93 // Apparently this is supposted to make gettext reload the message catalog...
94 _nl_msg_cat_cntr++;91 _nl_msg_cat_cntr++;
95 }92 }
93#endif
9694
97 FavoriteManager::getInstance()->load();95 FavoriteManager::getInstance()->load();
98 CryptoManager::getInstance()->loadCertificates();96 CryptoManager::getInstance()->loadCertificates();
9997
=== modified file 'dcpp/SConscript'
--- dcpp/SConscript 2010-10-07 04:32:15 +0000
+++ dcpp/SConscript 2011-01-25 05:38:26 +0000
@@ -2,14 +2,14 @@
22
3Import('env')3Import('env')
44
5# We don't want to add this CXXFLAG globally so we copy the env5dcpp_files = env.Glob('*.cpp')
6env = env.Clone()6
7env.Append(CPPDEFINES = 'BUILDING_DCPP')7env.Append(CPPDEFINES = 'BUILDING_DCPP')
88
9dcpp_files = env.Glob('*.cpp')
10
11# Build the dcpp files and create the library9# Build the dcpp files and create the library
12libdcpp = env.StaticLibrary(target = 'dcpp', source = dcpp_files)10libdcpp = env.StaticLibrary(target = 'dcpp', source = dcpp_files)
1311
12env.GenerateMessageCatalogs()
13
14Return('libdcpp')14Return('libdcpp')
1515
1616
=== modified file 'dcpp/Util.cpp'
--- dcpp/Util.cpp 2010-04-18 04:11:04 +0000
+++ dcpp/Util.cpp 2011-01-25 05:38:26 +0000
@@ -105,7 +105,7 @@
105105
106#endif106#endif
107107
108void Util::initialize() {108void Util::initialize(PathsMap pathOverrides) {
109 Text::initialize();109 Text::initialize();
110110
111 sgenrand((unsigned long)time(NULL));111 sgenrand((unsigned long)time(NULL));
@@ -170,10 +170,8 @@
170 }170 }
171171
172 paths[PATH_USER_LOCAL] = paths[PATH_USER_CONFIG];172 paths[PATH_USER_LOCAL] = paths[PATH_USER_CONFIG];
173173 paths[PATH_RESOURCES] = "/usr/share/";
174 // @todo paths[PATH_RESOURCES] = <replace from sconscript?>;174 paths[PATH_LOCALE] = paths[PATH_RESOURCES] + "locale/";
175 // @todo paths[PATH_LOCALE] = <replace from sconscript?>;
176
177 paths[PATH_DOWNLOADS] = home + "/Downloads/";175 paths[PATH_DOWNLOADS] = home + "/Downloads/";
178#endif176#endif
179177
@@ -181,6 +179,13 @@
181 paths[PATH_HUB_LISTS] = paths[PATH_USER_LOCAL] + "HubLists" PATH_SEPARATOR_STR;179 paths[PATH_HUB_LISTS] = paths[PATH_USER_LOCAL] + "HubLists" PATH_SEPARATOR_STR;
182 paths[PATH_NOTEPAD] = paths[PATH_USER_CONFIG] + "Notepad.txt";180 paths[PATH_NOTEPAD] = paths[PATH_USER_CONFIG] + "Notepad.txt";
183181
182 // Override core generated paths
183 for (PathsMap::const_iterator it = pathOverrides.begin(); it != pathOverrides.end(); ++it)
184 {
185 if (!it->second.empty())
186 paths[it->first] = it->second;
187 }
188
184 File::ensureDirectory(paths[PATH_USER_CONFIG]);189 File::ensureDirectory(paths[PATH_USER_CONFIG]);
185 File::ensureDirectory(paths[PATH_USER_LOCAL]);190 File::ensureDirectory(paths[PATH_USER_LOCAL]);
186191
187192
=== modified file 'dcpp/Util.h'
--- dcpp/Util.h 2009-08-15 04:40:26 +0000
+++ dcpp/Util.h 2011-01-25 05:38:26 +0000
@@ -118,7 +118,8 @@
118 PATH_LAST118 PATH_LAST
119 };119 };
120120
121 static void initialize();121 typedef std::map<Util::Paths, std::string> PathsMap;
122 static void initialize(PathsMap pathOverrides = PathsMap());
122123
123 /** Path of temporary storage */124 /** Path of temporary storage */
124 static string getTempPath() {125 static string getTempPath() {
125126
=== added file 'glade/SConscript'
--- glade/SConscript 1970-01-01 00:00:00 +0000
+++ glade/SConscript 2011-01-25 05:38:26 +0000
@@ -0,0 +1,10 @@
1# -*- coding: utf-8 -*-
2
3Import('env')
4
5glade_files = env.Glob('*.glade')
6
7pot_file = env.PotBuild(source=glade_files, target='po/glade.pot', LANGUAGE='glade')
8
9Return('pot_file')
10
011
=== modified file 'glade/favoritehubs.glade'
--- glade/favoritehubs.glade 2009-10-11 04:40:31 +0000
+++ glade/favoritehubs.glade 2011-01-25 05:38:26 +0000
@@ -170,7 +170,7 @@
170 <widget class="GtkLabel" id="labelAddress">170 <widget class="GtkLabel" id="labelAddress">
171 <property name="visible">True</property>171 <property name="visible">True</property>
172 <property name="xalign">0</property>172 <property name="xalign">0</property>
173 <property name="label" translatable="yes">_Address:</property>173 <property name="label" translatable="yes">_Hub address:</property>
174 <property name="use_underline">True</property>174 <property name="use_underline">True</property>
175 <property name="mnemonic_widget">entryAddress</property>175 <property name="mnemonic_widget">entryAddress</property>
176 </widget>176 </widget>
@@ -419,6 +419,15 @@
419 </widget>419 </widget>
420 </child>420 </child>
421 </widget>421 </widget>
422 <widget class="GtkMessageDialog" id="confirmDeletionDialog">
423 <property name="border_width">5</property>
424 <property name="destroy_with_parent">True</property>
425 <property name="type_hint">dialog</property>
426 <property name="skip_taskbar_hint">True</property>
427 <property name="message_type">warning</property>
428 <property name="buttons">ok-cancel</property>
429 <property name="text" translatable="yes">Are you sure you want to delete the selected favorite hub?</property>
430 </widget>
422 <widget class="GtkMenu" id="menu">431 <widget class="GtkMenu" id="menu">
423 <child>432 <child>
424 <widget class="GtkImageMenuItem" id="addMenuItem">433 <widget class="GtkImageMenuItem" id="addMenuItem">
425434
=== modified file 'glade/favoriteusers.glade'
--- glade/favoriteusers.glade 2010-05-22 14:23:56 +0000
+++ glade/favoriteusers.glade 2011-01-25 05:38:26 +0000
@@ -71,14 +71,14 @@
71 <child>71 <child>
72 <widget class="GtkMenuItem" id="connectItem">72 <widget class="GtkMenuItem" id="connectItem">
73 <property name="visible">True</property>73 <property name="visible">True</property>
74 <property name="label" translatable="yes">Connect to hub</property>74 <property name="label" translatable="yes">_Connect to hub</property>
75 <property name="use_underline">True</property>75 <property name="use_underline">True</property>
76 </widget>76 </widget>
77 </child>77 </child>
78 <child>78 <child>
79 <widget class="GtkMenuItem" id="descriptionItem">79 <widget class="GtkMenuItem" id="descriptionItem">
80 <property name="visible">True</property>80 <property name="visible">True</property>
81 <property name="label" translatable="yes">Description</property>81 <property name="label" translatable="yes">_Edit description...</property>
82 <property name="use_underline">True</property>82 <property name="use_underline">True</property>
83 </widget>83 </widget>
84 </child>84 </child>
@@ -130,8 +130,9 @@
130 <child>130 <child>
131 <widget class="GtkLabel" id="label10">131 <widget class="GtkLabel" id="label10">
132 <property name="visible">True</property>132 <property name="visible">True</property>
133 <property name="label" translatable="yes">&lt;b&gt;Description&lt;/b&gt;</property>133 <property name="label" translatable="yes">_Description:</property>
134 <property name="use_markup">True</property>134 <property name="use_underline">True</property>
135 <property name="mnemonic_widget">descriptionEntry</property>
135 </widget>136 </widget>
136 <packing>137 <packing>
137 <property name="type">label_item</property>138 <property name="type">label_item</property>
138139
=== modified file 'glade/hash.glade'
--- glade/hash.glade 2008-02-29 04:39:28 +0000
+++ glade/hash.glade 2011-01-25 05:38:26 +0000
@@ -94,7 +94,7 @@
94 <widget class="GtkProgressBar" id="progressbar">94 <widget class="GtkProgressBar" id="progressbar">
95 <property name="visible">True</property>95 <property name="visible">True</property>
96 <property name="pulse_step">0.10000000149011612</property>96 <property name="pulse_step">0.10000000149011612</property>
97 <property name="text" translatable="yes">0%</property>97 <property name="text" translatable="no">0%</property>
98 </widget>98 </widget>
99 <packing>99 <packing>
100 <property name="expand">False</property>100 <property name="expand">False</property>
101101
=== modified file 'glade/hub.glade'
--- glade/hub.glade 2010-09-05 00:10:54 +0000
+++ glade/hub.glade 2011-01-25 05:38:26 +0000
@@ -106,7 +106,7 @@
106 </child>106 </child>
107 </widget>107 </widget>
108 <widget class="GtkDialog" id="passwordDialog">108 <widget class="GtkDialog" id="passwordDialog">
109 <property name="title" translatable="yes">Enter hub password</property>109 <property name="title" translatable="yes">Hub Password</property>
110 <property name="resizable">False</property>110 <property name="resizable">False</property>
111 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>111 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
112 <child internal-child="vbox">112 <child internal-child="vbox">
@@ -139,8 +139,7 @@
139 <child>139 <child>
140 <widget class="GtkLabel" id="label1">140 <widget class="GtkLabel" id="label1">
141 <property name="visible">True</property>141 <property name="visible">True</property>
142 <property name="label" translatable="yes">&lt;b&gt;Enter your password&lt;/b&gt;</property>142 <property name="label" translatable="yes">Enter your password:</property>
143 <property name="use_markup">True</property>
144 </widget>143 </widget>
145 <packing>144 <packing>
146 <property name="type">label_item</property>145 <property name="type">label_item</property>
147146
=== modified file 'glade/mainwindow.glade'
--- glade/mainwindow.glade 2010-10-14 03:51:12 +0000
+++ glade/mainwindow.glade 2011-01-25 05:38:26 +0000
@@ -65,7 +65,7 @@
65 <child>65 <child>
66 <widget class="GtkImageMenuItem" id="quickConnectMenuItem">66 <widget class="GtkImageMenuItem" id="quickConnectMenuItem">
67 <property name="visible">True</property>67 <property name="visible">True</property>
68 <property name="label" translatable="yes">_Quick connect</property>68 <property name="label" translatable="yes">_Quick connect...</property>
69 <property name="use_underline">True</property>69 <property name="use_underline">True</property>
70 <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>70 <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
71 <child internal-child="image">71 <child internal-child="image">
@@ -693,66 +693,19 @@
693 </widget>693 </widget>
694 </child>694 </child>
695 </widget>695 </widget>
696 <widget class="GtkDialog" id="exitDialog">696 <widget class="GtkMessageDialog" id="exitDialog">
697 <property name="title" translatable="yes">Exit LinuxDC++?</property>697 <property name="border_width">5</property>
698 <property name="resizable">False</property>
699 <property name="destroy_with_parent">True</property>698 <property name="destroy_with_parent">True</property>
700 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>699 <property name="type_hint">dialog</property>
701 <property name="has_separator">False</property>700 <property name="skip_taskbar_hint">True</property>
702 <child internal-child="vbox">701 <property name="message_type">warning</property>
703 <widget class="GtkVBox" id="dialog-vbox1">702 <property name="buttons">ok-cancel</property>
704 <property name="visible">True</property>703 <property name="text" translatable="yes">Are you sure you want to exit the application?</property>
705 <child>
706 <widget class="GtkLabel" id="label3">
707 <property name="visible">True</property>
708 <property name="label" translatable="yes">Do you really want to exit?</property>
709 </widget>
710 <packing>
711 <property name="expand">False</property>
712 <property name="fill">False</property>
713 <property name="position">1</property>
714 </packing>
715 </child>
716 <child internal-child="action_area">
717 <widget class="GtkHButtonBox" id="dialog-action_area1">
718 <property name="visible">True</property>
719 <property name="layout_style">GTK_BUTTONBOX_END</property>
720 <child>
721 <widget class="GtkButton" id="cancelbutton1">
722 <property name="visible">True</property>
723 <property name="can_focus">True</property>
724 <property name="can_default">True</property>
725 <property name="label">gtk-cancel</property>
726 <property name="use_stock">True</property>
727 <property name="response_id">-6</property>
728 </widget>
729 </child>
730 <child>
731 <widget class="GtkButton" id="okbutton1">
732 <property name="visible">True</property>
733 <property name="can_focus">True</property>
734 <property name="can_default">True</property>
735 <property name="has_default">True</property>
736 <property name="label">gtk-ok</property>
737 <property name="use_stock">True</property>
738 <property name="response_id">-5</property>
739 </widget>
740 <packing>
741 <property name="position">1</property>
742 </packing>
743 </child>
744 </widget>
745 <packing>
746 <property name="expand">False</property>
747 <property name="pack_type">GTK_PACK_END</property>
748 </packing>
749 </child>
750 </widget>
751 </child>
752 </widget>704 </widget>
753 <widget class="GtkDialog" id="connectDialog">705 <widget class="GtkDialog" id="connectDialog">
754 <property name="title" translatable="yes">Connect to a hub</property>706 <property name="title" translatable="yes">Quick Connect</property>
755 <property name="destroy_with_parent">True</property>707 <property name="destroy_with_parent">True</property>
708 <property name="default_width">400</property>
756 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>709 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
757 <child internal-child="vbox">710 <child internal-child="vbox">
758 <widget class="GtkVBox" id="dialog-vbox2">711 <widget class="GtkVBox" id="dialog-vbox2">
@@ -785,8 +738,9 @@
785 <child>738 <child>
786 <widget class="GtkLabel" id="label4">739 <widget class="GtkLabel" id="label4">
787 <property name="visible">True</property>740 <property name="visible">True</property>
788 <property name="label" translatable="yes">&lt;b&gt;Connect to address:&lt;/b&gt;</property>741 <property name="label" translatable="yes">_Hub address:</property>
789 <property name="use_markup">True</property>742 <property name="use_underline">True</property>
743 <property name="mnemonic_widget">connectEntry</property>
790 </widget>744 </widget>
791 <packing>745 <packing>
792 <property name="type">label_item</property>746 <property name="type">label_item</property>
@@ -839,7 +793,7 @@
839 <property name="logo_icon_name">linuxdcpp</property>793 <property name="logo_icon_name">linuxdcpp</property>
840 <property name="destroy_with_parent">True</property>794 <property name="destroy_with_parent">True</property>
841 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>795 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
842 <property name="copyright" translatable="yes">Copyright © 2004-2009 Jens Oknelid</property>796 <property name="copyright" translatable="yes">Copyright © 2004-2011 Jens Oknelid</property>
843 <property name="comments" translatable="yes">A DC++ port for Linux797 <property name="comments" translatable="yes">A DC++ port for Linux
844798
845LinuxDC++ version: %s799LinuxDC++ version: %s
@@ -968,7 +922,7 @@
968 </child>922 </child>
969 </widget>923 </widget>
970 <widget class="GtkDialog" id="ucLineDialog">924 <widget class="GtkDialog" id="ucLineDialog">
971 <property name="title" translatable="yes">Enter line for user command</property>925 <property name="title" translatable="yes">User Command Argument</property>
972 <property name="default_width">300</property>926 <property name="default_width">300</property>
973 <property name="destroy_with_parent">True</property>927 <property name="destroy_with_parent">True</property>
974 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>928 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -1003,7 +957,6 @@
1003 <child>957 <child>
1004 <widget class="GtkLabel" id="ucLabel">958 <widget class="GtkLabel" id="ucLabel">
1005 <property name="visible">True</property>959 <property name="visible">True</property>
1006 <property name="use_markup">True</property>
1007 </widget>960 </widget>
1008 <packing>961 <packing>
1009 <property name="type">label_item</property>962 <property name="type">label_item</property>
@@ -1076,7 +1029,7 @@
1076 </child>1029 </child>
1077 </widget>1030 </widget>
1078 <widget class="GtkDialog" id="magnetDialog">1031 <widget class="GtkDialog" id="magnetDialog">
1079 <property name="title" translatable="yes">Magnet properties</property>1032 <property name="title" translatable="yes">Magnet Properties</property>
1080 <property name="modal">True</property>1033 <property name="modal">True</property>
1081 <property name="destroy_with_parent">True</property>1034 <property name="destroy_with_parent">True</property>
1082 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>1035 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -1095,7 +1048,9 @@
1095 <widget class="GtkLabel" id="label9">1048 <widget class="GtkLabel" id="label9">
1096 <property name="visible">True</property>1049 <property name="visible">True</property>
1097 <property name="xalign">0</property>1050 <property name="xalign">0</property>
1098 <property name="label" translatable="yes">Magnet</property>1051 <property name="label" translatable="yes">_Magnet:</property>
1052 <property name="use_underline">True</property>
1053 <property name="mnemonic_widget">magnetEntry</property>
1099 </widget>1054 </widget>
1100 <packing>1055 <packing>
1101 <property name="x_options">GTK_FILL</property>1056 <property name="x_options">GTK_FILL</property>
@@ -1106,7 +1061,9 @@
1106 <widget class="GtkLabel" id="label8">1061 <widget class="GtkLabel" id="label8">
1107 <property name="visible">True</property>1062 <property name="visible">True</property>
1108 <property name="xalign">0</property>1063 <property name="xalign">0</property>
1109 <property name="label" translatable="yes">File name</property>1064 <property name="label" translatable="yes">_Filename</property>
1065 <property name="use_underline">True</property>
1066 <property name="mnemonic_widget">magnetNameEntry</property>
1110 </widget>1067 </widget>
1111 <packing>1068 <packing>
1112 <property name="top_attach">1</property>1069 <property name="top_attach">1</property>
@@ -1119,7 +1076,9 @@
1119 <widget class="GtkLabel" id="label5">1076 <widget class="GtkLabel" id="label5">
1120 <property name="visible">True</property>1077 <property name="visible">True</property>
1121 <property name="xalign">0</property>1078 <property name="xalign">0</property>
1122 <property name="label" translatable="yes">Size</property>1079 <property name="label" translatable="yes">_Size:</property>
1080 <property name="use_underline">True</property>
1081 <property name="mnemonic_widget">magnetSizeEntry</property>
1123 </widget>1082 </widget>
1124 <packing>1083 <packing>
1125 <property name="top_attach">2</property>1084 <property name="top_attach">2</property>
@@ -1132,7 +1091,9 @@
1132 <widget class="GtkLabel" id="label7">1091 <widget class="GtkLabel" id="label7">
1133 <property name="visible">True</property>1092 <property name="visible">True</property>
1134 <property name="xalign">0</property>1093 <property name="xalign">0</property>
1135 <property name="label" translatable="yes">TTH</property>1094 <property name="label" translatable="yes">_TTH:</property>
1095 <property name="use_underline">True</property>
1096 <property name="mnemonic_widget">tthEntry</property>
1136 </widget>1097 </widget>
1137 <packing>1098 <packing>
1138 <property name="top_attach">4</property>1099 <property name="top_attach">4</property>
@@ -1201,7 +1162,9 @@
1201 <widget class="GtkLabel" id="label6">1162 <widget class="GtkLabel" id="label6">
1202 <property name="visible">True</property>1163 <property name="visible">True</property>
1203 <property name="xalign">0</property>1164 <property name="xalign">0</property>
1204 <property name="label" translatable="yes">Exact size</property>1165 <property name="label" translatable="yes">_Exact size:</property>
1166 <property name="use_underline">True</property>
1167 <property name="mnemonic_widget">exactSizeEntry</property>
1205 </widget>1168 </widget>
1206 <packing>1169 <packing>
1207 <property name="top_attach">3</property>1170 <property name="top_attach">3</property>
12081171
=== modified file 'glade/publichubs.glade'
--- glade/publichubs.glade 2008-05-27 00:23:19 +0000
+++ glade/publichubs.glade 2011-01-25 05:38:26 +0000
@@ -323,7 +323,7 @@
323 <child>323 <child>
324 <widget class="GtkImageMenuItem" id="favMenuItem">324 <widget class="GtkImageMenuItem" id="favMenuItem">
325 <property name="visible">True</property>325 <property name="visible">True</property>
326 <property name="label" translatable="yes">Add to favorites</property>326 <property name="label" translatable="yes">_Add to favorites</property>
327 <property name="use_underline">True</property>327 <property name="use_underline">True</property>
328 </widget>328 </widget>
329 </child>329 </child>
330330
=== modified file 'glade/search.glade'
--- glade/search.glade 2010-09-05 00:10:54 +0000
+++ glade/search.glade 2011-01-25 05:38:26 +0000
@@ -22,7 +22,9 @@
22 <widget class="GtkLabel" id="label1">22 <widget class="GtkLabel" id="label1">
23 <property name="visible">True</property>23 <property name="visible">True</property>
24 <property name="xalign">0</property>24 <property name="xalign">0</property>
25 <property name="label" translatable="yes">Search for</property>25 <property name="label" translatable="yes">_Search text:</property>
26 <property name="use_underline">True</property>
27 <property name="mnemonic_widget">comboboxentrySearch</property>
26 </widget>28 </widget>
27 <packing>29 <packing>
28 <property name="expand">False</property>30 <property name="expand">False</property>
@@ -442,7 +444,7 @@
442 <child>444 <child>
443 <widget class="GtkMenuItem" id="downloadToItem">445 <widget class="GtkMenuItem" id="downloadToItem">
444 <property name="visible">True</property>446 <property name="visible">True</property>
445 <property name="label" translatable="yes">Download _to...</property>447 <property name="label" translatable="yes">Download _to</property>
446 <property name="use_underline">True</property>448 <property name="use_underline">True</property>
447 <child>449 <child>
448 <widget class="GtkMenu" id="downloadMenu">450 <widget class="GtkMenu" id="downloadMenu">
@@ -453,14 +455,14 @@
453 <child>455 <child>
454 <widget class="GtkMenuItem" id="downloadWholeDirItem">456 <widget class="GtkMenuItem" id="downloadWholeDirItem">
455 <property name="visible">True</property>457 <property name="visible">True</property>
456 <property name="label" translatable="yes">Download _whole directory</property>458 <property name="label" translatable="yes">Do_wnload directory</property>
457 <property name="use_underline">True</property>459 <property name="use_underline">True</property>
458 </widget>460 </widget>
459 </child>461 </child>
460 <child>462 <child>
461 <widget class="GtkMenuItem" id="downloadWholeDirToItem">463 <widget class="GtkMenuItem" id="downloadWholeDirToItem">
462 <property name="visible">True</property>464 <property name="visible">True</property>
463 <property name="label" translatable="yes">Download whole director_y to...</property>465 <property name="label" translatable="yes">Download director_y to</property>
464 <property name="use_underline">True</property>466 <property name="use_underline">True</property>
465 <child>467 <child>
466 <widget class="GtkMenu" id="downloadDirMenu">468 <widget class="GtkMenu" id="downloadDirMenu">
467469
=== modified file 'glade/settingsdialog.glade'
--- glade/settingsdialog.glade 2010-09-05 00:10:54 +0000
+++ glade/settingsdialog.glade 2011-01-25 05:38:26 +0000
@@ -30,13 +30,31 @@
30 <property name="border_width">8</property>30 <property name="border_width">8</property>
31 <property name="n_rows">5</property>31 <property name="n_rows">5</property>
32 <property name="n_columns">2</property>32 <property name="n_columns">2</property>
33 <property name="column_spacing">4</property>33 <property name="column_spacing">10</property>
34 <property name="row_spacing">4</property>34 <property name="row_spacing">4</property>
35 <child>35 <child>
36 <widget class="GtkVBox" id="connectionBox">36 <widget class="GtkHBox" id="connectionBox">
37 <property name="visible">True</property>37 <property name="visible">True</property>
38 <child>38 <child>
39 <placeholder/>39 <widget class="GtkComboBox" id="speedComboBox">
40 <property name="visible">True</property>
41 <property name="items" translatable="no"/>
42 </widget>
43 <packing>
44 <property name="position">0</property>
45 </packing>
46 </child>
47 <child>
48 <widget class="GtkLabel" id="speedLabel">
49 <property name="visible">True</property>
50 <property name="label" translatable="yes">Mb/s</property>
51 </widget>
52 <packing>
53 <property name="expand">False</property>
54 <property name="fill">False</property>
55 <property name="padding">5</property>
56 <property name="position">1</property>
57 </packing>
40 </child>58 </child>
41 </widget>59 </widget>
42 <packing>60 <packing>
@@ -88,8 +106,10 @@
88 <child>106 <child>
89 <widget class="GtkLabel" id="label12">107 <widget class="GtkLabel" id="label12">
90 <property name="visible">True</property>108 <property name="visible">True</property>
91 <property name="xalign">1</property>109 <property name="xalign">0</property>
92 <property name="label" translatable="yes">Max upload speed (MiB/s)</property>110 <property name="label" translatable="yes">Max upload _speed:</property>
111 <property name="use-underline">True</property>
112 <property name="mnemonic_widget">speedComboBox</property>
93 </widget>113 </widget>
94 <packing>114 <packing>
95 <property name="top_attach">3</property>115 <property name="top_attach">3</property>
@@ -101,8 +121,10 @@
101 <child>121 <child>
102 <widget class="GtkLabel" id="label11">122 <widget class="GtkLabel" id="label11">
103 <property name="visible">True</property>123 <property name="visible">True</property>
104 <property name="xalign">1</property>124 <property name="xalign">0</property>
105 <property name="label" translatable="yes">Description</property>125 <property name="label" translatable="yes">_Description:</property>
126 <property name="use-underline">True</property>
127 <property name="mnemonic_widget">descriptionEntry</property>
106 </widget>128 </widget>
107 <packing>129 <packing>
108 <property name="top_attach">2</property>130 <property name="top_attach">2</property>
@@ -114,8 +136,10 @@
114 <child>136 <child>
115 <widget class="GtkLabel" id="label10">137 <widget class="GtkLabel" id="label10">
116 <property name="visible">True</property>138 <property name="visible">True</property>
117 <property name="xalign">1</property>139 <property name="xalign">0</property>
118 <property name="label" translatable="yes">E-Mail</property>140 <property name="label" translatable="yes">_Email:</property>
141 <property name="use-underline">True</property>
142 <property name="mnemonic_widget">emailEntry</property>
119 </widget>143 </widget>
120 <packing>144 <packing>
121 <property name="top_attach">1</property>145 <property name="top_attach">1</property>
@@ -127,8 +151,10 @@
127 <child>151 <child>
128 <widget class="GtkLabel" id="label9">152 <widget class="GtkLabel" id="label9">
129 <property name="visible">True</property>153 <property name="visible">True</property>
130 <property name="xalign">1</property>154 <property name="xalign">0</property>
131 <property name="label" translatable="yes">Username</property>155 <property name="label" translatable="yes">_Username:</property>
156 <property name="use-underline">True</property>
157 <property name="mnemonic_widget">nickEntry</property>
132 </widget>158 </widget>
133 <packing>159 <packing>
134 <property name="x_options">GTK_FILL</property>160 <property name="x_options">GTK_FILL</property>
@@ -138,8 +164,10 @@
138 <child>164 <child>
139 <widget class="GtkLabel" id="label15">165 <widget class="GtkLabel" id="label15">
140 <property name="visible">True</property>166 <property name="visible">True</property>
141 <property name="xalign">1</property>167 <property name="xalign">0</property>
142 <property name="label" translatable="yes">Default hub encoding</property>168 <property name="label" translatable="yes">Default _hub encoding:</property>
169 <property name="use-underline">True</property>
170 <property name="mnemonic_widget">comboboxCharset</property>
143 </widget>171 </widget>
144 <packing>172 <packing>
145 <property name="top_attach">4</property>173 <property name="top_attach">4</property>
@@ -272,8 +300,10 @@
272 <child>300 <child>
273 <widget class="GtkLabel" id="tlsLabel">301 <widget class="GtkLabel" id="tlsLabel">
274 <property name="visible">True</property>302 <property name="visible">True</property>
275 <property name="xalign">1</property>303 <property name="xalign">0</property>
276 <property name="label" translatable="yes">TLS</property>304 <property name="label" translatable="yes">T_LS:</property>
305 <property name="use_underline">True</property>
306 <property name="mnemonic_widget">tlsEntry</property>
277 </widget>307 </widget>
278 <packing>308 <packing>
279 <property name="left_attach">2</property>309 <property name="left_attach">2</property>
@@ -352,8 +382,10 @@
352 <child>382 <child>
353 <widget class="GtkLabel" id="udpLabel">383 <widget class="GtkLabel" id="udpLabel">
354 <property name="visible">True</property>384 <property name="visible">True</property>
355 <property name="xalign">1</property>385 <property name="xalign">0</property>
356 <property name="label" translatable="yes">UDP</property>386 <property name="label" translatable="yes">_UDP:</property>
387 <property name="use_underline">True</property>
388 <property name="mnemonic_widget">udpEntry</property>
357 </widget>389 </widget>
358 <packing>390 <packing>
359 <property name="left_attach">2</property>391 <property name="left_attach">2</property>
@@ -367,9 +399,10 @@
367 <child>399 <child>
368 <widget class="GtkLabel" id="tcpLabel">400 <widget class="GtkLabel" id="tcpLabel">
369 <property name="visible">True</property>401 <property name="visible">True</property>
370 <property name="xalign">1</property>402 <property name="xalign">0</property>
371 <property name="label" translatable="yes">TCP</property>403 <property name="label" translatable="yes">_TCP:</property>
372 <property name="justify">GTK_JUSTIFY_RIGHT</property>404 <property name="use_underline">True</property>
405 <property name="mnemonic_widget">tcpEntry</property>
373 </widget>406 </widget>
374 <packing>407 <packing>
375 <property name="left_attach">2</property>408 <property name="left_attach">2</property>
@@ -384,7 +417,8 @@
384 <widget class="GtkLabel" id="label149">417 <widget class="GtkLabel" id="label149">
385 <property name="visible">True</property>418 <property name="visible">True</property>
386 <property name="xalign">0</property>419 <property name="xalign">0</property>
387 <property name="label" translatable="yes">Ports</property>420 <property name="label" translatable="yes">&lt;b&gt;Ports&lt;/b&gt;</property>
421 <property name="use_markup">True</property>
388 </widget>422 </widget>
389 <packing>423 <packing>
390 <property name="left_attach">3</property>424 <property name="left_attach">3</property>
@@ -397,7 +431,7 @@
397 <widget class="GtkRadioButton" id="activeRadioButton">431 <widget class="GtkRadioButton" id="activeRadioButton">
398 <property name="visible">True</property>432 <property name="visible">True</property>
399 <property name="can_focus">True</property>433 <property name="can_focus">True</property>
400 <property name="label" translatable="yes">Active</property>434 <property name="label" translatable="yes">_Active</property>
401 <property name="use_underline">True</property>435 <property name="use_underline">True</property>
402 <property name="response_id">0</property>436 <property name="response_id">0</property>
403 <property name="draw_indicator">True</property>437 <property name="draw_indicator">True</property>
@@ -412,7 +446,7 @@
412 <widget class="GtkRadioButton" id="passiveRadioButton">446 <widget class="GtkRadioButton" id="passiveRadioButton">
413 <property name="visible">True</property>447 <property name="visible">True</property>
414 <property name="can_focus">True</property>448 <property name="can_focus">True</property>
415 <property name="label" translatable="yes">Firewall (passive, last resort)</property>449 <property name="label" translatable="yes">_Passive</property>
416 <property name="use_underline">True</property>450 <property name="use_underline">True</property>
417 <property name="response_id">0</property>451 <property name="response_id">0</property>
418 <property name="draw_indicator">True</property>452 <property name="draw_indicator">True</property>
@@ -428,8 +462,10 @@
428 <child>462 <child>
429 <widget class="GtkLabel" id="ipLabel">463 <widget class="GtkLabel" id="ipLabel">
430 <property name="visible">True</property>464 <property name="visible">True</property>
431 <property name="xalign">1</property>465 <property name="xalign">0</property>
432 <property name="label" translatable="yes">External / WAN IP</property>466 <property name="label" translatable="yes">Public _IP Address:</property>
467 <property name="use_underline">True</property>
468 <property name="mnemonic_widget">ipComboboxEntry</property>
433 </widget>469 </widget>
434 <packing>470 <packing>
435 <property name="left_attach">1</property>471 <property name="left_attach">1</property>
@@ -444,7 +480,7 @@
444 <widget class="GtkCheckButton" id="forceIPCheckButton">480 <widget class="GtkCheckButton" id="forceIPCheckButton">
445 <property name="visible">True</property>481 <property name="visible">True</property>
446 <property name="can_focus">True</property>482 <property name="can_focus">True</property>
447 <property name="label" translatable="yes">Don't allow hub/UPnP to override</property>483 <property name="label" translatable="yes">Don't allow hu_b / UPnP to override</property>
448 <property name="use_underline">True</property>484 <property name="use_underline">True</property>
449 <property name="response_id">0</property>485 <property name="response_id">0</property>
450 <property name="draw_indicator">True</property>486 <property name="draw_indicator">True</property>
@@ -462,7 +498,7 @@
462 <widget class="GtkRadioButton" id="portForwardRadioButton">498 <widget class="GtkRadioButton" id="portForwardRadioButton">
463 <property name="visible">True</property>499 <property name="visible">True</property>
464 <property name="can_focus">True</property>500 <property name="can_focus">True</property>
465 <property name="label" translatable="yes">Firewall with manual port forward</property>501 <property name="label" translatable="yes">_Manual port forwarding</property>
466 <property name="use_underline">True</property>502 <property name="use_underline">True</property>
467 <property name="response_id">0</property>503 <property name="response_id">0</property>
468 <property name="draw_indicator">True</property>504 <property name="draw_indicator">True</property>
@@ -479,7 +515,7 @@
479 <child>515 <child>
480 <widget class="GtkLabel" id="label139">516 <widget class="GtkLabel" id="label139">
481 <property name="visible">True</property>517 <property name="visible">True</property>
482 <property name="label" translatable="yes">&lt;b&gt;Incoming connection settings&lt;/b&gt;</property>518 <property name="label" translatable="yes">&lt;b&gt;Incoming Connection Settings&lt;/b&gt;</property>
483 <property name="use_markup">True</property>519 <property name="use_markup">True</property>
484 </widget>520 </widget>
485 <packing>521 <packing>
@@ -569,7 +605,9 @@
569 <widget class="GtkLabel" id="socksUserLabel">605 <widget class="GtkLabel" id="socksUserLabel">
570 <property name="visible">True</property>606 <property name="visible">True</property>
571 <property name="xalign">0</property>607 <property name="xalign">0</property>
572 <property name="label" translatable="yes">Username</property>608 <property name="label" translatable="yes">User_name:</property>
609 <property name="use_underline">True</property>
610 <property name="mnemonic_widget">socksUserEntry</property>
573 </widget>611 </widget>
574 <packing>612 <packing>
575 <property name="left_attach">1</property>613 <property name="left_attach">1</property>
@@ -584,7 +622,7 @@
584 <widget class="GtkCheckButton" id="socksCheckButton">622 <widget class="GtkCheckButton" id="socksCheckButton">
585 <property name="visible">True</property>623 <property name="visible">True</property>
586 <property name="can_focus">True</property>624 <property name="can_focus">True</property>
587 <property name="label" translatable="yes">Use SOCKS5 server to resolve hostnames</property>625 <property name="label" translatable="yes">Use SOCKS5 server to resolve _hostnames</property>
588 <property name="use_underline">True</property>626 <property name="use_underline">True</property>
589 <property name="response_id">0</property>627 <property name="response_id">0</property>
590 <property name="draw_indicator">True</property>628 <property name="draw_indicator">True</property>
@@ -616,7 +654,9 @@
616 <widget class="GtkLabel" id="socksPassLabel">654 <widget class="GtkLabel" id="socksPassLabel">
617 <property name="visible">True</property>655 <property name="visible">True</property>
618 <property name="xalign">0</property>656 <property name="xalign">0</property>
619 <property name="label" translatable="yes">Password</property>657 <property name="label" translatable="yes">Pass_word:</property>
658 <property name="use_underline">True</property>
659 <property name="mnemonic_widget">socksPassEntry</property>
620 </widget>660 </widget>
621 <packing>661 <packing>
622 <property name="left_attach">2</property>662 <property name="left_attach">2</property>
@@ -645,7 +685,9 @@
645 <widget class="GtkLabel" id="socksPortLabel">685 <widget class="GtkLabel" id="socksPortLabel">
646 <property name="visible">True</property>686 <property name="visible">True</property>
647 <property name="xalign">0</property>687 <property name="xalign">0</property>
648 <property name="label" translatable="yes">Port</property>688 <property name="label" translatable="yes">Po_rt:</property>
689 <property name="use_underline">True</property>
690 <property name="mnemonic_widget">socksPortEntry</property>
649 </widget>691 </widget>
650 <packing>692 <packing>
651 <property name="left_attach">2</property>693 <property name="left_attach">2</property>
@@ -660,7 +702,9 @@
660 <widget class="GtkLabel" id="socksIPLabel">702 <widget class="GtkLabel" id="socksIPLabel">
661 <property name="visible">True</property>703 <property name="visible">True</property>
662 <property name="xalign">0</property>704 <property name="xalign">0</property>
663 <property name="label" translatable="yes">Socks IP</property>705 <property name="label" translatable="yes">Soc_ks IP</property>
706 <property name="use_underline">True</property>
707 <property name="mnemonic_widget">socksIPEntry</property>
664 </widget>708 </widget>
665 <packing>709 <packing>
666 <property name="left_attach">1</property>710 <property name="left_attach">1</property>
@@ -675,7 +719,7 @@
675 <widget class="GtkRadioButton" id="socksRadioButton">719 <widget class="GtkRadioButton" id="socksRadioButton">
676 <property name="visible">True</property>720 <property name="visible">True</property>
677 <property name="can_focus">True</property>721 <property name="can_focus">True</property>
678 <property name="label" translatable="yes">SOCKS5</property>722 <property name="label" translatable="yes">_SOCKS5</property>
679 <property name="use_underline">True</property>723 <property name="use_underline">True</property>
680 <property name="response_id">0</property>724 <property name="response_id">0</property>
681 <property name="draw_indicator">True</property>725 <property name="draw_indicator">True</property>
@@ -692,7 +736,7 @@
692 <widget class="GtkRadioButton" id="outDirectRadioButton">736 <widget class="GtkRadioButton" id="outDirectRadioButton">
693 <property name="visible">True</property>737 <property name="visible">True</property>
694 <property name="can_focus">True</property>738 <property name="can_focus">True</property>
695 <property name="label" translatable="yes">Direct connection</property>739 <property name="label" translatable="yes">_Direct connection</property>
696 <property name="use_underline">True</property>740 <property name="use_underline">True</property>
697 <property name="response_id">0</property>741 <property name="response_id">0</property>
698 <property name="draw_indicator">True</property>742 <property name="draw_indicator">True</property>
@@ -712,7 +756,7 @@
712 <child>756 <child>
713 <widget class="GtkLabel" id="label8">757 <widget class="GtkLabel" id="label8">
714 <property name="visible">True</property>758 <property name="visible">True</property>
715 <property name="label" translatable="yes">&lt;b&gt;Outgoing connection settings&lt;/b&gt;</property>759 <property name="label" translatable="yes">&lt;b&gt;Outgoing Connection Settings&lt;/b&gt;</property>
716 <property name="use_markup">True</property>760 <property name="use_markup">True</property>
717 </widget>761 </widget>
718 <packing>762 <packing>
@@ -756,90 +800,64 @@
756 <property name="visible">True</property>800 <property name="visible">True</property>
757 <property name="label_xalign">0</property>801 <property name="label_xalign">0</property>
758 <child>802 <child>
759 <widget class="GtkVBox" id="vbox5">803 <widget class="GtkTable" id="table3">
760 <property name="visible">True</property>804 <property name="visible">True</property>
761 <property name="border_width">8</property>805 <property name="n_rows">2</property>
762 <child>806 <property name="n_columns">2</property>
763 <widget class="GtkLabel" id="label21">807 <property name="column_spacing">15</property>
764 <property name="visible">True</property>808 <property name="row_spacing">4</property>
765 <property name="xalign">0</property>809 <child>
766 <property name="label" translatable="yes">Default download directory</property>810 <widget class="GtkLabel" id="finishedDownloadsLabel">
767 </widget>811 <property name="visible">True</property>
768 <packing>812 <property name="xalign">0</property>
769 <property name="expand">False</property>813 <property name="xpad">8</property>
770 <property name="fill">False</property>814 <property name="label" translatable="yes">_Finished downloads:</property>
771 </packing>815 <property name="use_underline">True</property>
772 </child>816 <property name="mnemonic_widget">finishedDownloadsFileChooserButton</property>
773 <child>817 </widget>
774 <widget class="GtkHBox" id="hbox1">818 <packing>
775 <property name="visible">True</property>819 <property name="x_options">GTK_FILL</property>
776 <property name="spacing">4</property>820 </packing>
777 <child>821 </child>
778 <widget class="GtkEntry" id="finishedDownloadsEntry">822 <child>
779 <property name="visible">True</property>823 <widget class="GtkLabel" id="unfinishedDownloadsLabel">
780 <property name="can_focus">True</property>824 <property name="visible">True</property>
781 </widget>825 <property name="xalign">0</property>
782 </child>826 <property name="xpad">8</property>
783 <child>827 <property name="label" translatable="yes">Unfin_ished downloads:</property>
784 <widget class="GtkButton" id="finishedDownloadsButton">828 <property name="use_underline">True</property>
785 <property name="visible">True</property>829 <property name="mnemonic_widget">unfinishedDownloadsFileChooserButton</property>
786 <property name="can_focus">True</property>830 </widget>
787 <property name="label" translatable="yes">Browse...</property>831 <packing>
788 <property name="use_underline">True</property>832 <property name="top_attach">1</property>
789 <property name="response_id">0</property>833 <property name="bottom_attach">2</property>
790 </widget>834 <property name="x_options">GTK_FILL</property>
791 <packing>835 </packing>
792 <property name="expand">False</property>836 </child>
793 <property name="fill">False</property>837 <child>
794 <property name="position">1</property>838 <widget class="GtkFileChooserButton" id="unfinishedDownloadsFileChooserButton">
795 </packing>839 <property name="visible">True</property>
796 </child>840 <property name="local_only">False</property>
797 </widget>841 <property name="action">select-folder</property>
798 <packing>842 <property name="title" translatable="yes">Select a Folder</property>
799 <property name="expand">False</property>843 </widget>
800 <property name="position">1</property>844 <packing>
801 </packing>845 <property name="left_attach">1</property>
802 </child>846 <property name="right_attach">2</property>
803 <child>847 <property name="top_attach">1</property>
804 <widget class="GtkLabel" id="label22">848 <property name="bottom_attach">2</property>
805 <property name="visible">True</property>849 </packing>
806 <property name="xalign">0</property>850 </child>
807 <property name="label" translatable="yes">Unfinished downloads directory</property>851 <child>
808 </widget>852 <widget class="GtkFileChooserButton" id="finishedDownloadsFileChooserButton">
809 <packing>853 <property name="visible">True</property>
810 <property name="expand">False</property>854 <property name="local_only">False</property>
811 <property name="fill">False</property>855 <property name="action">select-folder</property>
812 <property name="position">2</property>856 <property name="title" translatable="yes">Select a Folder</property>
813 </packing>857 </widget>
814 </child>858 <packing>
815 <child>859 <property name="left_attach">1</property>
816 <widget class="GtkHBox" id="hbox2">860 <property name="right_attach">2</property>
817 <property name="visible">True</property>
818 <property name="spacing">4</property>
819 <child>
820 <widget class="GtkEntry" id="unfinishedDownloadsEntry">
821 <property name="visible">True</property>
822 <property name="can_focus">True</property>
823 </widget>
824 </child>
825 <child>
826 <widget class="GtkButton" id="unfinishedDownloadsButton">
827 <property name="visible">True</property>
828 <property name="can_focus">True</property>
829 <property name="label" translatable="yes">Browse...</property>
830 <property name="use_underline">True</property>
831 <property name="response_id">0</property>
832 </widget>
833 <packing>
834 <property name="expand">False</property>
835 <property name="fill">False</property>
836 <property name="position">1</property>
837 </packing>
838 </child>
839 </widget>
840 <packing>
841 <property name="expand">False</property>
842 <property name="position">3</property>
843 </packing>861 </packing>
844 </child>862 </child>
845 </widget>863 </widget>
@@ -864,86 +882,87 @@
864 <property name="visible">True</property>882 <property name="visible">True</property>
865 <property name="label_xalign">0</property>883 <property name="label_xalign">0</property>
866 <child>884 <child>
867 <widget class="GtkVBox" id="vbox6">885 <widget class="GtkTable" id="table5">
868 <property name="visible">True</property>886 <property name="visible">True</property>
869 <property name="border_width">8</property>887 <property name="n_rows">2</property>
870 <property name="spacing">2</property>888 <property name="n_columns">3</property>
871 <child>889 <property name="column_spacing">10</property>
872 <widget class="GtkTable" id="table5">890 <property name="row_spacing">4</property>
873 <property name="visible">True</property>891 <child>
874 <property name="n_rows">2</property>892 <widget class="GtkLabel" id="label25">
875 <property name="n_columns">2</property>893 <property name="visible">True</property>
876 <property name="column_spacing">4</property>894 <property name="xalign">0</property>
877 <property name="row_spacing">4</property>895 <property name="xpad">8</property>
878 <child>896 <property name="label" translatable="yes">_No new downloads if speed exceeds:</property>
879 <widget class="GtkLabel" id="label25">897 <property name="use_underline">True</property>
880 <property name="visible">True</property>898 <property name="mnemonic_widget">newDownloadsSpinButton</property>
881 <property name="xalign">0</property>899 </widget>
882 <property name="label" translatable="yes">No new downloads if speed exceeds (KiB/s, 0 = disable)</property>900 <packing>
883 </widget>901 <property name="top_attach">1</property>
884 <packing>902 <property name="bottom_attach">2</property>
885 <property name="left_attach">1</property>903 <property name="x_options">GTK_FILL</property>
886 <property name="right_attach">2</property>904 <property name="y_options"></property>
887 <property name="top_attach">1</property>905 </packing>
888 <property name="bottom_attach">2</property>906 </child>
889 <property name="x_options">GTK_FILL</property>907 <child>
890 <property name="y_options"></property>908 <widget class="GtkLabel" id="label24">
891 </packing>909 <property name="visible">True</property>
892 </child>910 <property name="xalign">0</property>
893 <child>911 <property name="xpad">8</property>
894 <widget class="GtkLabel" id="label24">912 <property name="label" translatable="yes">_Maximum simultaneous downloads:</property>
895 <property name="visible">True</property>913 <property name="use_underline">True</property>
896 <property name="xalign">0</property>914 <property name="mnemonic_widget">maxDownloadsSpinButton</property>
897 <property name="label" translatable="yes">Maximum simultaneous downloads (0 = infinite)</property>915 </widget>
898 </widget>916 <packing>
899 <packing>917 <property name="x_options">GTK_FILL</property>
900 <property name="left_attach">1</property>918 <property name="y_options"></property>
901 <property name="right_attach">2</property>919 </packing>
902 <property name="x_options">GTK_FILL</property>920 </child>
903 <property name="y_options"></property>921 <child>
904 </packing>922 <widget class="GtkSpinButton" id="newDownloadsSpinButton">
905 </child>923 <property name="visible">True</property>
906 <child>924 <property name="can_focus">True</property>
907 <widget class="GtkSpinButton" id="newDownloadsSpinButton">925 <property name="adjustment">0 0 10000 1 10 0</property>
908 <property name="visible">True</property>926 <property name="climb_rate">1</property>
909 <property name="can_focus">True</property>927 <property name="tooltip_text" translatable="yes">A value of '0' will disable this option</property>
910 <property name="adjustment">1 0 10000 1 10 0</property>928 </widget>
911 <property name="climb_rate">1</property>929 <packing>
912 </widget>930 <property name="left_attach">1</property>
913 <packing>931 <property name="right_attach">2</property>
914 <property name="top_attach">1</property>932 <property name="top_attach">1</property>
915 <property name="bottom_attach">2</property>933 <property name="bottom_attach">2</property>
916 <property name="x_options">GTK_FILL</property>934 <property name="x_options">GTK_FILL</property>
917 <property name="y_options"></property>935 <property name="y_options"></property>
918 </packing>936 </packing>
919 </child>937 </child>
920 <child>938 <child>
921 <widget class="GtkSpinButton" id="maxDownloadsSpinButton">939 <widget class="GtkSpinButton" id="maxDownloadsSpinButton">
922 <property name="visible">True</property>940 <property name="visible">True</property>
923 <property name="can_focus">True</property>941 <property name="can_focus">True</property>
924 <property name="adjustment">0 0 100 1 10 0</property>942 <property name="adjustment">0 0 100 1 10 0</property>
925 <property name="climb_rate">1</property>943 <property name="climb_rate">1</property>
926 </widget>944 <property name="tooltip_text" translatable="yes">A value of '0' will disable this option</property>
927 <packing>945 </widget>
928 <property name="x_options">GTK_FILL</property>946 <packing>
929 <property name="y_options"></property>947 <property name="left_attach">1</property>
930 </packing>948 <property name="right_attach">2</property>
931 </child>949 <property name="x_options">GTK_FILL</property>
932 </widget>950 <property name="y_options"></property>
933 <packing>951 </packing>
934 <property name="expand">False</property>952 </child>
935 </packing>953 <child>
936 </child>954 <widget class="GtkLabel" id="kiBpsLabel">
937 <child>955 <property name="visible">True</property>
938 <widget class="GtkLabel" id="label26">956 <property name="xalign">0</property>
939 <property name="visible">True</property>957 <property name="label" translatable="yes">KiB/s</property>
940 <property name="xalign">0</property>958 </widget>
941 <property name="label" translatable="yes">Note; because of changing download speeds, this is not 100% accurate...</property>959 <packing>
942 </widget>960 <property name="left_attach">2</property>
943 <packing>961 <property name="right_attach">3</property>
944 <property name="expand">False</property>962 <property name="top_attach">1</property>
945 <property name="fill">False</property>963 <property name="bottom_attach">2</property>
946 <property name="position">1</property>964 <property name="x_options">GTK_FILL</property>
965 <property name="y_options"></property>
947 </packing>966 </packing>
948 </child>967 </child>
949 </widget>968 </widget>
@@ -974,58 +993,92 @@
974 <property name="border_width">8</property>993 <property name="border_width">8</property>
975 <property name="spacing">4</property>994 <property name="spacing">4</property>
976 <child>995 <child>
977 <widget class="GtkVBox" id="vbox8">996 <widget class="GtkHBox" id="hbox5">
978 <property name="visible">True</property>997 <property name="visible">True</property>
998 <property name="spacing">4</property>
979 <child>999 <child>
980 <widget class="GtkLabel" id="label28">1000 <widget class="GtkTreeView" id="publicHubsTreeView">
981 <property name="visible">True</property>1001 <property name="visible">True</property>
982 <property name="xalign">0</property>1002 <property name="can_focus">True</property>
983 <property name="label" translatable="yes">Public Hubs list URL</property>
984 </widget>1003 </widget>
985 <packing>
986 <property name="expand">False</property>
987 <property name="fill">False</property>
988 </packing>
989 </child>1004 </child>
990 <child>1005 <child>
991 <widget class="GtkHBox" id="hbox3">1006 <widget class="GtkVBox" id="vbox6">
992 <property name="visible">True</property>1007 <property name="visible">True</property>
993 <child>1008 <property name="spacing">0</property>
994 <widget class="GtkButton" id="publicHubsButton">1009 <child>
995 <property name="visible">True</property>1010 <widget class="GtkButton" id="publicHubsAddButton">
996 <property name="can_focus">True</property>1011 <property name="visible">True</property>
997 <property name="label" translatable="yes">Configure Public Hub Lists</property>1012 <property name="can_focus">True</property>
998 <property name="use_underline">True</property>1013 <property name="label">gtk-add</property>
999 <property name="response_id">0</property>1014 <property name="use_stock">True</property>
1000 </widget>1015 <property name="response_id">0</property>
1001 <packing>1016 </widget>
1002 <property name="expand">False</property>1017 <packing>
1003 <property name="fill">False</property>1018 <property name="expand">False</property>
1004 </packing>1019 <property name="fill">False</property>
1005 </child>1020 </packing>
1006 <child>1021 </child>
1007 <placeholder/>1022 <child>
1023 <widget class="GtkButton" id="publicHubsUpButton">
1024 <property name="visible">True</property>
1025 <property name="can_focus">True</property>
1026 <property name="label">gtk-go-up</property>
1027 <property name="use_stock">True</property>
1028 <property name="response_id">0</property>
1029 </widget>
1030 <packing>
1031 <property name="expand">False</property>
1032 <property name="fill">False</property>
1033 <property name="position">1</property>
1034 </packing>
1035 </child>
1036 <child>
1037 <widget class="GtkButton" id="publicHubsDownButton">
1038 <property name="visible">True</property>
1039 <property name="can_focus">True</property>
1040 <property name="label">gtk-go-down</property>
1041 <property name="use_stock">True</property>
1042 <property name="response_id">0</property>
1043 </widget>
1044 <packing>
1045 <property name="expand">False</property>
1046 <property name="fill">False</property>
1047 <property name="position">2</property>
1048 </packing>
1049 </child>
1050 <child>
1051 <widget class="GtkButton" id="publicHubsRemoveButton">
1052 <property name="visible">True</property>
1053 <property name="can_focus">True</property>
1054 <property name="label">gtk-remove</property>
1055 <property name="use_stock">True</property>
1056 <property name="response_id">0</property>
1057 </widget>
1058 <packing>
1059 <property name="expand">False</property>
1060 <property name="fill">False</property>
1061 <property name="position">3</property>
1062 </packing>
1008 </child>1063 </child>
1009 </widget>1064 </widget>
1010 <packing>1065 <packing>
1011 <property name="expand">False</property>1066 <property name="expand">False</property>
1012 <property name="fill">False</property>
1013 <property name="position">1</property>1067 <property name="position">1</property>
1014 </packing>1068 </packing>
1015 </child>1069 </child>
1016 </widget>1070 </widget>
1017 <packing>
1018 <property name="expand">False</property>
1019 </packing>
1020 </child>1071 </child>
1021 <child>1072 <child>
1022 <widget class="GtkVBox" id="vbox9">1073 <widget class="GtkHBox" id="httpProxyHBox">
1023 <property name="visible">True</property>1074 <property name="visible">True</property>
1024 <child>1075 <child>
1025 <widget class="GtkLabel" id="label29">1076 <widget class="GtkLabel" id="label29">
1026 <property name="visible">True</property>1077 <property name="visible">True</property>
1027 <property name="xalign">0</property>1078 <property name="xalign">0</property>
1028 <property name="label" translatable="yes">HTTP Proxy (for hublist only)</property>1079 <property name="label" translatable="yes">_HTTP proxy:</property>
1080 <property name="use_underline">True</property>
1081 <property name="mnemonic_widget">proxyEntry</property>
1029 </widget>1082 </widget>
1030 <packing>1083 <packing>
1031 <property name="expand">False</property>1084 <property name="expand">False</property>
@@ -1038,9 +1091,10 @@
1038 <property name="can_focus">True</property>1091 <property name="can_focus">True</property>
1039 </widget>1092 </widget>
1040 <packing>1093 <packing>
1041 <property name="expand">False</property>1094 <property name="expand">True</property>
1042 <property name="fill">False</property>1095 <property name="fill">True</property>
1043 <property name="position">1</property>1096 <property name="position">1</property>
1097 <property name="padding">15</property>
1044 </packing>1098 </packing>
1045 </child>1099 </child>
1046 </widget>1100 </widget>
@@ -1053,7 +1107,7 @@
1053 <child>1107 <child>
1054 <widget class="GtkLabel" id="label27">1108 <widget class="GtkLabel" id="label27">
1055 <property name="visible">True</property>1109 <property name="visible">True</property>
1056 <property name="label" translatable="yes">&lt;b&gt;Public Hubs list&lt;/b&gt;</property>1110 <property name="label" translatable="yes">&lt;b&gt;Public Hubs List&lt;/b&gt;</property>
1057 <property name="use_markup">True</property>1111 <property name="use_markup">True</property>
1058 </widget>1112 </widget>
1059 <packing>1113 <packing>
@@ -1159,8 +1213,10 @@
1159 <child>1213 <child>
1160 <widget class="GtkLabel" id="label32">1214 <widget class="GtkLabel" id="label32">
1161 <property name="visible">True</property>1215 <property name="visible">True</property>
1162 <property name="label" translatable="yes">&lt;b&gt;Favorite download to directories&lt;/b&gt;</property>1216 <property name="label" translatable="yes">&lt;b&gt;_Favorite Download Directories&lt;/b&gt;</property>
1163 <property name="use_markup">True</property>1217 <property name="use_markup">True</property>
1218 <property name="use_underline">True</property>
1219 <property name="mnemonic_widget">favoriteTreeView</property>
1164 </widget>1220 </widget>
1165 <packing>1221 <packing>
1166 <property name="type">label_item</property>1222 <property name="type">label_item</property>
@@ -1174,7 +1230,7 @@
1174 <child>1230 <child>
1175 <widget class="GtkLabel" id="label30">1231 <widget class="GtkLabel" id="label30">
1176 <property name="visible">True</property>1232 <property name="visible">True</property>
1177 <property name="label" translatable="yes">Download to</property>1233 <property name="label" translatable="yes">Favorite Downloads</property>
1178 </widget>1234 </widget>
1179 <packing>1235 <packing>
1180 <property name="type">tab</property>1236 <property name="type">tab</property>
@@ -1195,16 +1251,10 @@
1195 <property name="visible">True</property>1251 <property name="visible">True</property>
1196 <property name="border_width">4</property>1252 <property name="border_width">4</property>
1197 <property name="n_rows">2</property>1253 <property name="n_rows">2</property>
1198 <property name="n_columns">7</property>1254 <property name="n_columns">6</property>
1199 <property name="column_spacing">4</property>1255 <property name="column_spacing">10</property>
1200 <property name="row_spacing">4</property>1256 <property name="row_spacing">4</property>
1201 <child>1257 <child>
1202 <placeholder/>
1203 </child>
1204 <child>
1205 <placeholder/>
1206 </child>
1207 <child>
1208 <widget class="GtkSpinButton" id="priorityHighestSpinButton">1258 <widget class="GtkSpinButton" id="priorityHighestSpinButton">
1209 <property name="visible">True</property>1259 <property name="visible">True</property>
1210 <property name="can_focus">True</property>1260 <property name="can_focus">True</property>
@@ -1226,8 +1276,8 @@
1226 <property name="climb_rate">1</property>1276 <property name="climb_rate">1</property>
1227 </widget>1277 </widget>
1228 <packing>1278 <packing>
1229 <property name="left_attach">5</property>1279 <property name="left_attach">4</property>
1230 <property name="right_attach">6</property>1280 <property name="right_attach">5</property>
1231 <property name="top_attach">1</property>1281 <property name="top_attach">1</property>
1232 <property name="bottom_attach">2</property>1282 <property name="bottom_attach">2</property>
1233 <property name="x_options"></property>1283 <property name="x_options"></property>
@@ -1242,8 +1292,8 @@
1242 <property name="climb_rate">1</property>1292 <property name="climb_rate">1</property>
1243 </widget>1293 </widget>
1244 <packing>1294 <packing>
1245 <property name="left_attach">5</property>1295 <property name="left_attach">4</property>
1246 <property name="right_attach">6</property>1296 <property name="right_attach">5</property>
1247 <property name="x_options"></property>1297 <property name="x_options"></property>
1248 <property name="y_options"></property>1298 <property name="y_options"></property>
1249 </packing>1299 </packing>
@@ -1252,11 +1302,13 @@
1252 <widget class="GtkLabel" id="label183">1302 <widget class="GtkLabel" id="label183">
1253 <property name="visible">True</property>1303 <property name="visible">True</property>
1254 <property name="xalign">0</property>1304 <property name="xalign">0</property>
1255 <property name="label" translatable="yes">High priority max size</property>1305 <property name="label" translatable="yes">_High priority max size:</property>
1306 <property name="use_underline">True</property>
1307 <property name="mnemonic_widget">priorityHighSpinButton</property>
1256 </widget>1308 </widget>
1257 <packing>1309 <packing>
1258 <property name="left_attach">4</property>1310 <property name="left_attach">3</property>
1259 <property name="right_attach">5</property>1311 <property name="right_attach">4</property>
1260 <property name="x_options">GTK_FILL</property>1312 <property name="x_options">GTK_FILL</property>
1261 <property name="y_options"></property>1313 <property name="y_options"></property>
1262 </packing>1314 </packing>
@@ -1265,11 +1317,13 @@
1265 <widget class="GtkLabel" id="label184">1317 <widget class="GtkLabel" id="label184">
1266 <property name="visible">True</property>1318 <property name="visible">True</property>
1267 <property name="xalign">0</property>1319 <property name="xalign">0</property>
1268 <property name="label" translatable="yes">Low priority size</property>1320 <property name="label" translatable="yes">_Low priority max size:</property>
1321 <property name="use_underline">True</property>
1322 <property name="mnemonic_widget">priorityLowSpinButton</property>
1269 </widget>1323 </widget>
1270 <packing>1324 <packing>
1271 <property name="left_attach">4</property>1325 <property name="left_attach">3</property>
1272 <property name="right_attach">5</property>1326 <property name="right_attach">4</property>
1273 <property name="top_attach">1</property>1327 <property name="top_attach">1</property>
1274 <property name="bottom_attach">2</property>1328 <property name="bottom_attach">2</property>
1275 <property name="x_options">GTK_FILL</property>1329 <property name="x_options">GTK_FILL</property>
@@ -1283,8 +1337,8 @@
1283 <property name="label" translatable="yes">KiB</property>1337 <property name="label" translatable="yes">KiB</property>
1284 </widget>1338 </widget>
1285 <packing>1339 <packing>
1286 <property name="left_attach">6</property>1340 <property name="left_attach">5</property>
1287 <property name="right_attach">7</property>1341 <property name="right_attach">6</property>
1288 <property name="top_attach">1</property>1342 <property name="top_attach">1</property>
1289 <property name="bottom_attach">2</property>1343 <property name="bottom_attach">2</property>
1290 <property name="x_options">GTK_FILL</property>1344 <property name="x_options">GTK_FILL</property>
@@ -1298,8 +1352,8 @@
1298 <property name="label" translatable="yes">KiB</property>1352 <property name="label" translatable="yes">KiB</property>
1299 </widget>1353 </widget>
1300 <packing>1354 <packing>
1301 <property name="left_attach">6</property>1355 <property name="left_attach">5</property>
1302 <property name="right_attach">7</property>1356 <property name="right_attach">6</property>
1303 <property name="x_options">GTK_FILL</property>1357 <property name="x_options">GTK_FILL</property>
1304 <property name="y_options"></property>1358 <property name="y_options"></property>
1305 </packing>1359 </packing>
@@ -1352,7 +1406,9 @@
1352 <widget class="GtkLabel" id="label177">1406 <widget class="GtkLabel" id="label177">
1353 <property name="visible">True</property>1407 <property name="visible">True</property>
1354 <property name="xalign">0</property>1408 <property name="xalign">0</property>
1355 <property name="label" translatable="yes">Normal priority max size</property>1409 <property name="label" translatable="yes">_Normal priority max size:</property>
1410 <property name="use_underline">True</property>
1411 <property name="mnemonic_widget">priorityNormalSpinButton</property>
1356 </widget>1412 </widget>
1357 <packing>1413 <packing>
1358 <property name="top_attach">1</property>1414 <property name="top_attach">1</property>
@@ -1365,7 +1421,9 @@
1365 <widget class="GtkLabel" id="label176">1421 <widget class="GtkLabel" id="label176">
1366 <property name="visible">True</property>1422 <property name="visible">True</property>
1367 <property name="xalign">0</property>1423 <property name="xalign">0</property>
1368 <property name="label" translatable="yes">Highest priority max size</property>1424 <property name="label" translatable="yes">Highes_t priority max size:</property>
1425 <property name="use_underline">True</property>
1426 <property name="mnemonic_widget">priorityHighestSpinButton</property>
1369 </widget>1427 </widget>
1370 <packing>1428 <packing>
1371 <property name="x_options">GTK_FILL</property>1429 <property name="x_options">GTK_FILL</property>
@@ -1377,7 +1435,7 @@
1377 <child>1435 <child>
1378 <widget class="GtkLabel" id="label173">1436 <widget class="GtkLabel" id="label173">
1379 <property name="visible">True</property>1437 <property name="visible">True</property>
1380 <property name="label" translatable="yes">&lt;b&gt;Auto-priority settings&lt;/b&gt;</property>1438 <property name="label" translatable="yes">&lt;b&gt;Auto-Priority&lt;/b&gt;</property>
1381 <property name="use_markup">True</property>1439 <property name="use_markup">True</property>
1382 </widget>1440 </widget>
1383 <packing>1441 <packing>
@@ -1399,22 +1457,10 @@
1399 <property name="visible">True</property>1457 <property name="visible">True</property>
1400 <property name="border_width">4</property>1458 <property name="border_width">4</property>
1401 <property name="n_rows">3</property>1459 <property name="n_rows">3</property>
1402 <property name="n_columns">7</property>1460 <property name="n_columns">6</property>
1403 <property name="column_spacing">4</property>1461 <property name="column_spacing">10</property>
1404 <property name="row_spacing">4</property>1462 <property name="row_spacing">4</property>
1405 <child>1463 <child>
1406 <placeholder/>
1407 </child>
1408 <child>
1409 <placeholder/>
1410 </child>
1411 <child>
1412 <placeholder/>
1413 </child>
1414 <child>
1415 <placeholder/>
1416 </child>
1417 <child>
1418 <widget class="GtkSpinButton" id="dropMinSourcesSpinButton">1464 <widget class="GtkSpinButton" id="dropMinSourcesSpinButton">
1419 <property name="visible">True</property>1465 <property name="visible">True</property>
1420 <property name="can_focus">True</property>1466 <property name="can_focus">True</property>
@@ -1454,8 +1500,8 @@
1454 <property name="climb_rate">1</property>1500 <property name="climb_rate">1</property>
1455 </widget>1501 </widget>
1456 <packing>1502 <packing>
1457 <property name="left_attach">5</property>1503 <property name="left_attach">4</property>
1458 <property name="right_attach">6</property>1504 <property name="right_attach">5</property>
1459 <property name="x_options"></property>1505 <property name="x_options"></property>
1460 <property name="y_options"></property>1506 <property name="y_options"></property>
1461 </packing>1507 </packing>
@@ -1468,8 +1514,8 @@
1468 <property name="climb_rate">1</property>1514 <property name="climb_rate">1</property>
1469 </widget>1515 </widget>
1470 <packing>1516 <packing>
1471 <property name="left_attach">5</property>1517 <property name="left_attach">4</property>
1472 <property name="right_attach">6</property>1518 <property name="right_attach">5</property>
1473 <property name="top_attach">2</property>1519 <property name="top_attach">2</property>
1474 <property name="bottom_attach">3</property>1520 <property name="bottom_attach">3</property>
1475 <property name="x_options"></property>1521 <property name="x_options"></property>
@@ -1484,8 +1530,8 @@
1484 <property name="climb_rate">1</property>1530 <property name="climb_rate">1</property>
1485 </widget>1531 </widget>
1486 <packing>1532 <packing>
1487 <property name="left_attach">5</property>1533 <property name="left_attach">4</property>
1488 <property name="right_attach">6</property>1534 <property name="right_attach">5</property>
1489 <property name="top_attach">1</property>1535 <property name="top_attach">1</property>
1490 <property name="bottom_attach">2</property>1536 <property name="bottom_attach">2</property>
1491 <property name="x_options"></property>1537 <property name="x_options"></property>
@@ -1496,11 +1542,13 @@
1496 <widget class="GtkLabel" id="label194">1542 <widget class="GtkLabel" id="label194">
1497 <property name="visible">True</property>1543 <property name="visible">True</property>
1498 <property name="xalign">0</property>1544 <property name="xalign">0</property>
1499 <property name="label" translatable="yes">Min filesize</property>1545 <property name="label" translatable="yes">Min _file size:</property>
1546 <property name="use_underline">True</property>
1547 <property name="mnemonic_widget">dropSizeSpinButton</property>
1500 </widget>1548 </widget>
1501 <packing>1549 <packing>
1502 <property name="left_attach">4</property>1550 <property name="left_attach">3</property>
1503 <property name="right_attach">5</property>1551 <property name="right_attach">4</property>
1504 <property name="top_attach">2</property>1552 <property name="top_attach">2</property>
1505 <property name="bottom_attach">3</property>1553 <property name="bottom_attach">3</property>
1506 <property name="x_options">GTK_FILL</property>1554 <property name="x_options">GTK_FILL</property>
@@ -1511,11 +1559,13 @@
1511 <widget class="GtkLabel" id="label193">1559 <widget class="GtkLabel" id="label193">
1512 <property name="visible">True</property>1560 <property name="visible">True</property>
1513 <property name="xalign">0</property>1561 <property name="xalign">0</property>
1514 <property name="label" translatable="yes">Max inactivity</property>1562 <property name="label" translatable="yes">Max _inactivity:</property>
1563 <property name="use_underline">True</property>
1564 <property name="mnemonic_widget">dropInactiveSpinButton</property>
1515 </widget>1565 </widget>
1516 <packing>1566 <packing>
1517 <property name="left_attach">4</property>1567 <property name="left_attach">3</property>
1518 <property name="right_attach">5</property>1568 <property name="right_attach">4</property>
1519 <property name="top_attach">1</property>1569 <property name="top_attach">1</property>
1520 <property name="bottom_attach">2</property>1570 <property name="bottom_attach">2</property>
1521 <property name="x_options">GTK_FILL</property>1571 <property name="x_options">GTK_FILL</property>
@@ -1526,11 +1576,13 @@
1526 <widget class="GtkLabel" id="label192">1576 <widget class="GtkLabel" id="label192">
1527 <property name="visible">True</property>1577 <property name="visible">True</property>
1528 <property name="xalign">0</property>1578 <property name="xalign">0</property>
1529 <property name="label" translatable="yes">Check every</property>1579 <property name="label" translatable="yes">Chec_k every:</property>
1580 <property name="use_underline">True</property>
1581 <property name="mnemonic_widget">dropCheckSpinButton</property>
1530 </widget>1582 </widget>
1531 <packing>1583 <packing>
1532 <property name="left_attach">4</property>1584 <property name="left_attach">3</property>
1533 <property name="right_attach">5</property>1585 <property name="right_attach">4</property>
1534 <property name="x_options">GTK_FILL</property>1586 <property name="x_options">GTK_FILL</property>
1535 <property name="y_options"></property>1587 <property name="y_options"></property>
1536 </packing>1588 </packing>
@@ -1542,8 +1594,8 @@
1542 <property name="label" translatable="yes">KiB</property>1594 <property name="label" translatable="yes">KiB</property>
1543 </widget>1595 </widget>
1544 <packing>1596 <packing>
1545 <property name="left_attach">6</property>1597 <property name="left_attach">5</property>
1546 <property name="right_attach">7</property>1598 <property name="right_attach">6</property>
1547 <property name="top_attach">2</property>1599 <property name="top_attach">2</property>
1548 <property name="bottom_attach">3</property>1600 <property name="bottom_attach">3</property>
1549 <property name="x_options">GTK_FILL</property>1601 <property name="x_options">GTK_FILL</property>
@@ -1557,8 +1609,8 @@
1557 <property name="label" translatable="yes">s</property>1609 <property name="label" translatable="yes">s</property>
1558 </widget>1610 </widget>
1559 <packing>1611 <packing>
1560 <property name="left_attach">6</property>1612 <property name="left_attach">5</property>
1561 <property name="right_attach">7</property>1613 <property name="right_attach">6</property>
1562 <property name="top_attach">1</property>1614 <property name="top_attach">1</property>
1563 <property name="bottom_attach">2</property>1615 <property name="bottom_attach">2</property>
1564 <property name="x_options">GTK_FILL</property>1616 <property name="x_options">GTK_FILL</property>
@@ -1572,8 +1624,8 @@
1572 <property name="label" translatable="yes">s</property>1624 <property name="label" translatable="yes">s</property>
1573 </widget>1625 </widget>
1574 <packing>1626 <packing>
1575 <property name="left_attach">6</property>1627 <property name="left_attach">5</property>
1576 <property name="right_attach">7</property>1628 <property name="right_attach">6</property>
1577 <property name="x_options">GTK_FILL</property>1629 <property name="x_options">GTK_FILL</property>
1578 <property name="y_options"></property>1630 <property name="y_options"></property>
1579 </packing>1631 </packing>
@@ -1624,7 +1676,9 @@
1624 <widget class="GtkLabel" id="label180">1676 <widget class="GtkLabel" id="label180">
1625 <property name="visible">True</property>1677 <property name="visible">True</property>
1626 <property name="xalign">0</property>1678 <property name="xalign">0</property>
1627 <property name="label" translatable="yes">Min sources online</property>1679 <property name="label" translatable="yes">Min _sources online:</property>
1680 <property name="use_underline">True</property>
1681 <property name="mnemonic_widget">dropMinSourcesSpinButton</property>
1628 </widget>1682 </widget>
1629 <packing>1683 <packing>
1630 <property name="top_attach">2</property>1684 <property name="top_attach">2</property>
@@ -1637,7 +1691,9 @@
1637 <widget class="GtkLabel" id="label179">1691 <widget class="GtkLabel" id="label179">
1638 <property name="visible">True</property>1692 <property name="visible">True</property>
1639 <property name="xalign">0</property>1693 <property name="xalign">0</property>
1640 <property name="label" translatable="yes">Min elapsed</property>1694 <property name="label" translatable="yes">Min _elapsed:</property>
1695 <property name="use_underline">True</property>
1696 <property name="mnemonic_widget">dropElapsedSpinButton</property>
1641 </widget>1697 </widget>
1642 <packing>1698 <packing>
1643 <property name="top_attach">1</property>1699 <property name="top_attach">1</property>
@@ -1650,7 +1706,9 @@
1650 <widget class="GtkLabel" id="label178">1706 <widget class="GtkLabel" id="label178">
1651 <property name="visible">True</property>1707 <property name="visible">True</property>
1652 <property name="xalign">0</property>1708 <property name="xalign">0</property>
1653 <property name="label" translatable="yes">Drop sources below</property>1709 <property name="label" translatable="yes">_Drop sources below:</property>
1710 <property name="use_underline">True</property>
1711 <property name="mnemonic_widget">dropSpeedSpinButton</property>
1654 </widget>1712 </widget>
1655 <packing>1713 <packing>
1656 <property name="x_options">GTK_FILL</property>1714 <property name="x_options">GTK_FILL</property>
@@ -1662,7 +1720,7 @@
1662 <child>1720 <child>
1663 <widget class="GtkLabel" id="label174">1721 <widget class="GtkLabel" id="label174">
1664 <property name="visible">True</property>1722 <property name="visible">True</property>
1665 <property name="label" translatable="yes">&lt;b&gt;Auto-drop settings&lt;/b&gt;</property>1723 <property name="label" translatable="yes">&lt;b&gt;Auto-Drop&lt;/b&gt;</property>
1666 <property name="use_markup">True</property>1724 <property name="use_markup">True</property>
1667 </widget>1725 </widget>
1668 <packing>1726 <packing>
@@ -1700,8 +1758,10 @@
1700 <child>1758 <child>
1701 <widget class="GtkLabel" id="label175">1759 <widget class="GtkLabel" id="label175">
1702 <property name="visible">True</property>1760 <property name="visible">True</property>
1703 <property name="label" translatable="yes">&lt;b&gt;Other queue options&lt;/b&gt;</property>1761 <property name="label" translatable="yes">&lt;b&gt;O_ptions&lt;/b&gt;</property>
1704 <property name="use_markup">True</property>1762 <property name="use_markup">True</property>
1763 <property name="use_underline">True</property>
1764 <property name="mnemonic_widget">queueOtherTreeView</property>
1705 </widget>1765 </widget>
1706 <packing>1766 <packing>
1707 <property name="type">label_item</property>1767 <property name="type">label_item</property>
@@ -1775,91 +1835,53 @@
1775 </widget>1835 </widget>
1776 </child>1836 </child>
1777 <child>1837 <child>
1778 <widget class="GtkLabel" id="label34">
1779 <property name="visible">True</property>
1780 <property name="xalign">0</property>
1781 <property name="label" translatable="yes">Note: New files are added to the share only once they've been hashed!</property>
1782 </widget>
1783 <packing>
1784 <property name="expand">False</property>
1785 <property name="fill">False</property>
1786 <property name="position">1</property>
1787 </packing>
1788 </child>
1789 <child>
1790 <widget class="GtkHBox" id="hbox5">1838 <widget class="GtkHBox" id="hbox5">
1791 <property name="visible">True</property>1839 <property name="visible">True</property>
1792 <child>1840 <child>
1793 <widget class="GtkLabel" id="sharedSizeLabel">1841 <widget class="GtkLabel" id="sharedSizeLabel">
1794 <property name="visible">True</property>1842 <property name="visible">True</property>
1795 <property name="xalign">0</property>1843 <property name="xalign">0</property>
1796 <property name="label" translatable="yes">Total size: 0 B</property>1844 <property name="label" translatable="yes">Total size: %1%</property>
1797 </widget>1845 </widget>
1846 <packing>
1847 <property name="expand">True</property>
1848 <property name="fill">True</property>
1849 <property name="position">0</property>
1850 </packing>
1798 </child>1851 </child>
1799 <child>1852 <child>
1800 <widget class="GtkHBox" id="hbox6">1853 <widget class="GtkButton" id="sharedAddButton">
1801 <property name="visible">True</property>1854 <property name="visible">True</property>
1802 <property name="spacing">4</property>1855 <property name="can_focus">True</property>
1803 <child>1856 <property name="label">gtk-add</property>
1804 <widget class="GtkCheckButton" id="shareHiddenCheckButton">1857 <property name="use_stock">True</property>
1805 <property name="visible">True</property>1858 <property name="response_id">0</property>
1806 <property name="can_focus">True</property>
1807 <property name="label" translatable="yes">Share hidden files</property>
1808 <property name="use_underline">True</property>
1809 <property name="response_id">0</property>
1810 <property name="draw_indicator">True</property>
1811 </widget>
1812 </child>
1813 <child>
1814 <widget class="GtkCheckButton" id="followLinksCheckButton">
1815 <property name="visible">True</property>
1816 <property name="can_focus">True</property>
1817 <property name="label" translatable="yes">Follow Links</property>
1818 <property name="use_underline">True</property>
1819 <property name="response_id">0</property>
1820 <property name="draw_indicator">True</property>
1821 </widget>
1822 <packing>
1823 <property name="position">1</property>
1824 </packing>
1825 </child>
1826 <child>
1827 <widget class="GtkButton" id="sharedAddButton">
1828 <property name="visible">True</property>
1829 <property name="can_focus">True</property>
1830 <property name="label">gtk-add</property>
1831 <property name="use_stock">True</property>
1832 <property name="response_id">0</property>
1833 </widget>
1834 <packing>
1835 <property name="expand">False</property>
1836 <property name="fill">False</property>
1837 <property name="position">2</property>
1838 </packing>
1839 </child>
1840 <child>
1841 <widget class="GtkButton" id="sharedRemoveButton">
1842 <property name="visible">True</property>
1843 <property name="can_focus">True</property>
1844 <property name="label">gtk-remove</property>
1845 <property name="use_stock">True</property>
1846 <property name="response_id">0</property>
1847 </widget>
1848 <packing>
1849 <property name="expand">False</property>
1850 <property name="fill">False</property>
1851 <property name="position">3</property>
1852 </packing>
1853 </child>
1854 </widget>1859 </widget>
1855 <packing>1860 <packing>
1861 <property name="expand">False</property>
1862 <property name="fill">False</property>
1856 <property name="position">1</property>1863 <property name="position">1</property>
1857 </packing>1864 </packing>
1858 </child>1865 </child>
1866 <child>
1867 <widget class="GtkButton" id="sharedRemoveButton">
1868 <property name="visible">True</property>
1869 <property name="can_focus">True</property>
1870 <property name="label">gtk-remove</property>
1871 <property name="use_stock">True</property>
1872 <property name="response_id">0</property>
1873 </widget>
1874 <packing>
1875 <property name="expand">False</property>
1876 <property name="fill">False</property>
1877 <property name="position">2</property>
1878 </packing>
1879 </child>
1859 </widget>1880 </widget>
1860 <packing>1881 <packing>
1861 <property name="expand">False</property>1882 <property name="expand">False</property>
1862 <property name="position">2</property>1883 <property name="fill">False</property>
1884 <property name="position">1</property>
1863 </packing>1885 </packing>
1864 </child>1886 </child>
1865 </widget>1887 </widget>
@@ -1867,7 +1889,7 @@
1867 <child>1889 <child>
1868 <widget class="GtkLabel" id="label33">1890 <widget class="GtkLabel" id="label33">
1869 <property name="visible">True</property>1891 <property name="visible">True</property>
1870 <property name="label" translatable="yes">&lt;b&gt;Shared directories&lt;/b&gt;</property>1892 <property name="label" translatable="yes">&lt;b&gt;Shared Directories&lt;/b&gt;</property>
1871 <property name="use_markup">True</property>1893 <property name="use_markup">True</property>
1872 </widget>1894 </widget>
1873 <packing>1895 <packing>
@@ -1879,12 +1901,39 @@
1879 <child>1901 <child>
1880 <widget class="GtkTable" id="table6">1902 <widget class="GtkTable" id="table6">
1881 <property name="visible">True</property>1903 <property name="visible">True</property>
1882 <property name="n_rows">2</property>1904 <property name="n_rows">4</property>
1883 <property name="n_columns">3</property>1905 <property name="n_columns">3</property>
1884 <property name="column_spacing">4</property>1906 <property name="column_spacing">10</property>
1885 <property name="row_spacing">4</property>1907 <property name="row_spacing">4</property>
1886 <child>1908 <child>
1887 <placeholder/>1909 <widget class="GtkCheckButton" id="followLinksCheckButton">
1910 <property name="visible">True</property>
1911 <property name="can_focus">True</property>
1912 <property name="label" translatable="yes">_Follow links</property>
1913 <property name="use_underline">True</property>
1914 <property name="response_id">0</property>
1915 <property name="draw_indicator">True</property>
1916 </widget>
1917 <packing>
1918 <property name="x_options">GTK_FILL</property>
1919 <property name="y_options"></property>
1920 </packing>
1921 </child>
1922 <child>
1923 <widget class="GtkCheckButton" id="shareHiddenCheckButton">
1924 <property name="visible">True</property>
1925 <property name="can_focus">True</property>
1926 <property name="label" translatable="yes">_Share hidden files</property>
1927 <property name="use_underline">True</property>
1928 <property name="response_id">0</property>
1929 <property name="draw_indicator">True</property>
1930 </widget>
1931 <packing>
1932 <property name="top_attach">1</property>
1933 <property name="bottom_attach">2</property>
1934 <property name="x_options">GTK_FILL</property>
1935 <property name="y_options"></property>
1936 </packing>
1888 </child>1937 </child>
1889 <child>1938 <child>
1890 <widget class="GtkSpinButton" id="sharedUploadSlotsSpinButton">1939 <widget class="GtkSpinButton" id="sharedUploadSlotsSpinButton">
@@ -1896,8 +1945,8 @@
1896 <packing>1945 <packing>
1897 <property name="left_attach">1</property>1946 <property name="left_attach">1</property>
1898 <property name="right_attach">2</property>1947 <property name="right_attach">2</property>
1899 <property name="top_attach">1</property>1948 <property name="top_attach">3</property>
1900 <property name="bottom_attach">2</property>1949 <property name="bottom_attach">4</property>
1901 <property name="x_options">GTK_FILL</property>1950 <property name="x_options">GTK_FILL</property>
1902 <property name="y_options"></property>1951 <property name="y_options"></property>
1903 </packing>1952 </packing>
@@ -1905,12 +1954,14 @@
1905 <child>1954 <child>
1906 <widget class="GtkLabel" id="label38">1955 <widget class="GtkLabel" id="label38">
1907 <property name="visible">True</property>1956 <property name="visible">True</property>
1908 <property name="xalign">1</property>1957 <property name="xalign">0</property>
1909 <property name="label" translatable="yes">Upload slots</property>1958 <property name="label" translatable="yes">_Upload slots:</property>
1959 <property name="use_underline">True</property>
1960 <property name="mnemonic_widget">sharedUploadSlotsSpinButton</property>
1910 </widget>1961 </widget>
1911 <packing>1962 <packing>
1912 <property name="top_attach">1</property>1963 <property name="top_attach">3</property>
1913 <property name="bottom_attach">2</property>1964 <property name="bottom_attach">4</property>
1914 <property name="x_options">GTK_FILL</property>1965 <property name="x_options">GTK_FILL</property>
1915 <property name="y_options"></property>1966 <property name="y_options"></property>
1916 </packing>1967 </packing>
@@ -1922,6 +1973,8 @@
1922 <property name="label" translatable="yes">KiB/s</property>1973 <property name="label" translatable="yes">KiB/s</property>
1923 </widget>1974 </widget>
1924 <packing>1975 <packing>
1976 <property name="top_attach">2</property>
1977 <property name="bottom_attach">3</property>
1925 <property name="left_attach">2</property>1978 <property name="left_attach">2</property>
1926 <property name="right_attach">3</property>1979 <property name="right_attach">3</property>
1927 <property name="x_options">GTK_FILL</property>1980 <property name="x_options">GTK_FILL</property>
@@ -1934,8 +1987,11 @@
1934 <property name="can_focus">True</property>1987 <property name="can_focus">True</property>
1935 <property name="adjustment">0 0 10000 1 10 0</property>1988 <property name="adjustment">0 0 10000 1 10 0</property>
1936 <property name="climb_rate">1</property>1989 <property name="climb_rate">1</property>
1990 <property name="tooltip_text" translatable="yes">A value of '0' will disable this option</property>
1937 </widget>1991 </widget>
1938 <packing>1992 <packing>
1993 <property name="top_attach">2</property>
1994 <property name="bottom_attach">3</property>
1939 <property name="left_attach">1</property>1995 <property name="left_attach">1</property>
1940 <property name="right_attach">2</property>1996 <property name="right_attach">2</property>
1941 <property name="x_options">GTK_FILL</property>1997 <property name="x_options">GTK_FILL</property>
@@ -1945,10 +2001,15 @@
1945 <child>2001 <child>
1946 <widget class="GtkLabel" id="label36">2002 <widget class="GtkLabel" id="label36">
1947 <property name="visible">True</property>2003 <property name="visible">True</property>
1948 <property name="xalign">1</property>2004 <property name="xalign">0</property>
1949 <property name="label" translatable="yes">Automatically open extra slot if speed is below (0 = disable)</property>2005 <property name="label" translatable="yes">Automatically open _extra slot if speed is below:</property>
2006 <property name="use_underline">True</property>
2007 <property name="mnemonic_widget">sharedExtraSlotSpinButton</property>
1950 </widget>2008 </widget>
1951 <packing>2009 <packing>
2010 <property name="top_attach">2</property>
2011 <property name="bottom_attach">3</property>
2012 <property name="x_options">GTK_FILL</property>
1952 <property name="y_options"></property>2013 <property name="y_options"></property>
1953 </packing>2014 </packing>
1954 </child>2015 </child>
@@ -2011,8 +2072,10 @@
2011 <child>2072 <child>
2012 <widget class="GtkLabel" id="label200">2073 <widget class="GtkLabel" id="label200">
2013 <property name="visible">True</property>2074 <property name="visible">True</property>
2014 <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>2075 <property name="label" translatable="yes">&lt;b&gt;O_ptions&lt;/b&gt;</property>
2015 <property name="use_markup">True</property>2076 <property name="use_markup">True</property>
2077 <property name="use_underline">True</property>
2078 <property name="mnemonic_widget">appearanceOptionsTreeView</property>
2016 </widget>2079 </widget>
2017 <packing>2080 <packing>
2018 <property name="type">label_item</property>2081 <property name="type">label_item</property>
@@ -2023,184 +2086,151 @@
2023 </widget>2086 </widget>
2024 </child>2087 </child>
2025 <child>2088 <child>
2026 <widget class="GtkHBox" id="hbox4">2089 <widget class="GtkTable" id="table4">
2027 <property name="visible">True</property>2090 <property name="visible">True</property>
2028 <child>2091 <property name="n_rows">4</property>
2029 <widget class="GtkFrame" id="frame9">2092 <property name="n_columns">2</property>
2030 <property name="visible">True</property>2093 <property name="column_spacing">15</property>
2031 <property name="label_xalign">0</property>2094 <property name="row_spacing">4</property>
2032 <child>2095 <child>
2033 <widget class="GtkAlignment" id="alignment6">2096 <widget class="GtkLabel" id="label43">
2034 <property name="visible">True</property>2097 <property name="visible">True</property>
2035 <property name="bottom_padding">5</property>2098 <property name="xalign">0</property>
2036 <property name="left_padding">12</property>2099 <property name="label" translatable="yes">_Default away message:</property>
2037 <child>2100 <property name="use_underline">True</property>
2038 <widget class="GtkHBox" id="tabPositionHBox">2101 <property name="mnemonic_widget">awayMessageEntry</property>
2039 <property name="visible">True</property>2102 </widget>
2040 <child>2103 <packing>
2041 <widget class="GtkComboBox" id="tabPositionComboBox">2104 <property name="top_attach">3</property>
2042 <property name="visible">True</property>2105 <property name="bottom_attach">4</property>
2043 <property name="items" translatable="yes">Top2106 <property name="x_options">GTK_FILL</property>
2044Left2107 <property name="y_options"></property>
2045Right2108 </packing>
2046Bottom</property>2109 </child>
2047 </widget>2110 <child>
2048 <packing>2111 <widget class="GtkEntry" id="awayMessageEntry">
2049 <property name="expand">False</property>2112 <property name="visible">True</property>
2050 <property name="fill">False</property>2113 <property name="can_focus">True</property>
2051 </packing>2114 <property name="invisible_char">&#x25CF;</property>
2052 </child>2115 </widget>
2053 </widget>2116 <packing>
2054 </child>2117 <property name="left_attach">1</property>
2055 </widget>2118 <property name="right_attach">2</property>
2056 </child>2119 <property name="top_attach">3</property>
2057 <child>2120 <property name="bottom_attach">4</property>
2058 <widget class="GtkLabel" id="label16">2121 <property name="y_options"></property>
2059 <property name="visible">True</property>2122 </packing>
2060 <property name="label" translatable="yes">&lt;b&gt;Tab Position&lt;/b&gt;</property>2123 </child>
2061 <property name="use_markup">True</property>2124 <child>
2062 </widget>2125 <widget class="GtkLabel" id="label44">
2063 <packing>2126 <property name="visible">True</property>
2064 <property name="type">label_item</property>2127 <property name="xalign">0</property>
2065 </packing>2128 <property name="label" translatable="yes">Timestamp _format:</property>
2066 </child>2129 <property name="use_underline">True</property>
2067 </widget>2130 <property name="mnemonic_widget">timestampEntry</property>
2068 </child>2131 </widget>
2069 <child>2132 <packing>
2070 <widget class="GtkFrame" id="frame10">2133 <property name="top_attach">2</property>
2071 <property name="visible">True</property>2134 <property name="bottom_attach">3</property>
2072 <property name="label_xalign">0</property>2135 <property name="x_options">GTK_FILL</property>
2073 <child>2136 <property name="y_options"></property>
2074 <widget class="GtkAlignment" id="alignment7">2137 </packing>
2075 <property name="visible">True</property>2138 </child>
2076 <property name="bottom_padding">5</property>2139 <child>
2077 <property name="left_padding">12</property>2140 <widget class="GtkEntry" id="timestampEntry">
2078 <child>2141 <property name="visible">True</property>
2079 <widget class="GtkHBox" id="toolbarStyleHBox">2142 <property name="can_focus">True</property>
2080 <property name="visible">True</property>2143 <property name="invisible_char">&#x25CF;</property>
2081 <child>2144 </widget>
2082 <widget class="GtkComboBox" id="toolbarStyleComboBox">2145 <packing>
2083 <property name="visible">True</property>2146 <property name="left_attach">1</property>
2084 <property name="items" translatable="yes">Icons2147 <property name="right_attach">2</property>
2148 <property name="top_attach">2</property>
2149 <property name="bottom_attach">3</property>
2150 <property name="y_options"></property>
2151 </packing>
2152 </child>
2153 <child>
2154 <widget class="GtkLabel" id="label17">
2155 <property name="visible">True</property>
2156 <property name="xalign">0</property>
2157 <property name="label" translatable="yes">_Main toolbar style:</property>
2158 <property name="mnemonic_widget">toolbarStyleComboBox</property>
2159 <property name="use_underline">True</property>
2160 </widget>
2161 <packing>
2162 <property name="top_attach">1</property>
2163 <property name="bottom_attach">2</property>
2164 <property name="x_options">GTK_FILL</property>
2165 <property name="y_options"></property>
2166 </packing>
2167 </child>
2168 <child>
2169 <widget class="GtkLabel" id="label16">
2170 <property name="visible">True</property>
2171 <property name="xalign">0</property>
2172 <property name="label" translatable="yes">_Tab position:</property>
2173 <property name="mnemonic_widget">tabPositionComboBox</property>
2174 <property name="use_underline">True</property>
2175 </widget>
2176 <packing>
2177 <property name="x_options">GTK_FILL</property>
2178 <property name="y_options"></property>
2179 </packing>
2180 </child>
2181 <child>
2182 <widget class="GtkAspectFrame" id="aspectframe2">
2183 <property name="visible">True</property>
2184 <property name="label_xalign">0</property>
2185 <property name="shadow_type">none</property>
2186 <property name="xalign">0</property>
2187 <child>
2188 <widget class="GtkComboBox" id="toolbarStyleComboBox">
2189 <property name="visible">True</property>
2190 <property name="items" translatable="yes">Icons
2085Text2191Text
2086Both2192Both
2087Both horizontal2193Both horizontal
2088Hidden2194Hidden
2089System default</property>2195System default</property>
2090 </widget>
2091 <packing>
2092 <property name="expand">False</property>
2093 <property name="fill">False</property>
2094 </packing>
2095 </child>
2096 </widget>
2097 </child>
2098 </widget>2196 </widget>
2099 </child>2197 </child>
2198 </widget>
2199 <packing>
2200 <property name="left_attach">1</property>
2201 <property name="right_attach">2</property>
2202 <property name="top_attach">1</property>
2203 <property name="bottom_attach">2</property>
2204 <property name="y_options">GTK_FILL</property>
2205 </packing>
2206 </child>
2207 <child>
2208 <widget class="GtkAspectFrame" id="aspectframe1">
2209 <property name="visible">True</property>
2210 <property name="label_xalign">0</property>
2211 <property name="shadow_type">none</property>
2212 <property name="xalign">0</property>
2100 <child>2213 <child>
2101 <widget class="GtkLabel" id="label17">2214 <widget class="GtkComboBox" id="tabPositionComboBox">
2102 <property name="visible">True</property>2215 <property name="visible">True</property>
2103 <property name="label" translatable="yes">&lt;b&gt;Main Toolbar Style&lt;/b&gt;</property>2216 <property name="items" translatable="yes">Top
2104 <property name="use_markup">True</property>2217Left
2218Right
2219Bottom</property>
2105 </widget>2220 </widget>
2106 <packing>
2107 <property name="type">label_item</property>
2108 </packing>
2109 </child>2221 </child>
2110 </widget>2222 </widget>
2111 <packing>2223 <packing>
2112 <property name="position">1</property>2224 <property name="left_attach">1</property>
2225 <property name="right_attach">2</property>
2226 <property name="y_options">GTK_FILL</property>
2113 </packing>2227 </packing>
2114 </child>2228 </child>
2115 </widget>2229 </widget>
2116 <packing>2230 <packing>
2117 <property name="expand">False</property>
2118 <property name="fill">False</property>
2119 <property name="position">1</property>2231 <property name="position">1</property>
2120 </packing>2232 </packing>
2121 </child>2233 </child>
2122 <child>
2123 <widget class="GtkHBox" id="hbox18">
2124 <property name="visible">True</property>
2125 <child>
2126 <widget class="GtkFrame" id="frame12">
2127 <property name="visible">True</property>
2128 <property name="label_xalign">0</property>
2129 <child>
2130 <widget class="GtkHBox" id="hbox8">
2131 <property name="visible">True</property>
2132 <property name="border_width">8</property>
2133 <child>
2134 <widget class="GtkEntry" id="awayMessageEntry">
2135 <property name="visible">True</property>
2136 <property name="can_focus">True</property>
2137 </widget>
2138 </child>
2139 </widget>
2140 </child>
2141 <child>
2142 <widget class="GtkLabel" id="label43">
2143 <property name="visible">True</property>
2144 <property name="label" translatable="yes">&lt;b&gt;Default away message&lt;/b&gt;</property>
2145 <property name="use_markup">True</property>
2146 </widget>
2147 <packing>
2148 <property name="type">label_item</property>
2149 </packing>
2150 </child>
2151 </widget>
2152 </child>
2153 <child>
2154 <widget class="GtkFrame" id="frame13">
2155 <property name="visible">True</property>
2156 <property name="label_xalign">0</property>
2157 <child>
2158 <widget class="GtkHBox" id="hbox9">
2159 <property name="visible">True</property>
2160 <property name="border_width">8</property>
2161 <child>
2162 <widget class="GtkEntry" id="timestampEntry">
2163 <property name="visible">True</property>
2164 <property name="can_focus">True</property>
2165 </widget>
2166 </child>
2167 </widget>
2168 </child>
2169 <child>
2170 <widget class="GtkLabel" id="label44">
2171 <property name="visible">True</property>
2172 <property name="label" translatable="yes">&lt;b&gt;Timestamps&lt;/b&gt;</property>
2173 <property name="use_markup">True</property>
2174 </widget>
2175 <packing>
2176 <property name="type">label_item</property>
2177 </packing>
2178 </child>
2179 </widget>
2180 <packing>
2181 <property name="position">1</property>
2182 </packing>
2183 </child>
2184 </widget>
2185 <packing>
2186 <property name="expand">False</property>
2187 <property name="fill">False</property>
2188 <property name="position">2</property>
2189 </packing>
2190 </child>
2191 <child>
2192 <widget class="GtkLabel" id="label45">
2193 <property name="visible">True</property>
2194 <property name="xalign">0</property>
2195 <property name="yalign">0</property>
2196 <property name="label" translatable="yes">Note: Most of these options require that you restart the application</property>
2197 </widget>
2198 <packing>
2199 <property name="expand">False</property>
2200 <property name="fill">False</property>
2201 <property name="position">3</property>
2202 </packing>
2203 </child>
2204 </widget>2234 </widget>
2205 </child>2235 </child>
2206 <child>2236 <child>
@@ -2220,6 +2250,7 @@
2220 <child>2250 <child>
2221 <widget class="GtkFrame" id="frame45">2251 <widget class="GtkFrame" id="frame45">
2222 <property name="visible">True</property>2252 <property name="visible">True</property>
2253 <property name="sensitive">False</property>
2223 <property name="label_xalign">0</property>2254 <property name="label_xalign">0</property>
2224 <child>2255 <child>
2225 <widget class="GtkTable" id="table23">2256 <widget class="GtkTable" id="table23">
@@ -2233,7 +2264,7 @@
2233 <widget class="GtkButton" id="upColor">2264 <widget class="GtkButton" id="upColor">
2234 <property name="visible">True</property>2265 <property name="visible">True</property>
2235 <property name="can_focus">True</property>2266 <property name="can_focus">True</property>
2236 <property name="label" translatable="yes">Uploads</property>2267 <property name="label" translatable="yes">_Uploads</property>
2237 <property name="use_underline">True</property>2268 <property name="use_underline">True</property>
2238 <property name="response_id">0</property>2269 <property name="response_id">0</property>
2239 </widget>2270 </widget>
@@ -2248,7 +2279,7 @@
2248 <widget class="GtkButton" id="downColor">2279 <widget class="GtkButton" id="downColor">
2249 <property name="visible">True</property>2280 <property name="visible">True</property>
2250 <property name="can_focus">True</property>2281 <property name="can_focus">True</property>
2251 <property name="label" translatable="yes">Downloads</property>2282 <property name="label" translatable="yes">_Downloads</property>
2252 <property name="use_underline">True</property>2283 <property name="use_underline">True</property>
2253 <property name="response_id">0</property>2284 <property name="response_id">0</property>
2254 </widget>2285 </widget>
@@ -2265,7 +2296,7 @@
2265 <widget class="GtkButton" id="textStyle">2296 <widget class="GtkButton" id="textStyle">
2266 <property name="visible">True</property>2297 <property name="visible">True</property>
2267 <property name="can_focus">True</property>2298 <property name="can_focus">True</property>
2268 <property name="label" translatable="yes">Select text style</property>2299 <property name="label" translatable="yes">Select _text style</property>
2269 <property name="use_underline">True</property>2300 <property name="use_underline">True</property>
2270 <property name="response_id">0</property>2301 <property name="response_id">0</property>
2271 </widget>2302 </widget>
@@ -2280,7 +2311,7 @@
2280 <widget class="GtkButton" id="appearanceColor">2311 <widget class="GtkButton" id="appearanceColor">
2281 <property name="visible">True</property>2312 <property name="visible">True</property>
2282 <property name="can_focus">True</property>2313 <property name="can_focus">True</property>
2283 <property name="label" translatable="yes">Select window color</property>2314 <property name="label" translatable="yes">Select window _color</property>
2284 <property name="use_underline">True</property>2315 <property name="use_underline">True</property>
2285 <property name="response_id">0</property>2316 <property name="response_id">0</property>
2286 </widget>2317 </widget>
@@ -2310,6 +2341,7 @@
2310 <child>2341 <child>
2311 <widget class="GtkFrame" id="frame46">2342 <widget class="GtkFrame" id="frame46">
2312 <property name="visible">True</property>2343 <property name="visible">True</property>
2344 <property name="sensitive">False</property>
2313 <property name="label_xalign">0</property>2345 <property name="label_xalign">0</property>
2314 <child>2346 <child>
2315 <widget class="GtkVBox" id="vbox21">2347 <widget class="GtkVBox" id="vbox21">
@@ -2320,7 +2352,7 @@
2320 <widget class="GtkCheckButton" id="soundPMReceivedCheckButton">2352 <widget class="GtkCheckButton" id="soundPMReceivedCheckButton">
2321 <property name="visible">True</property>2353 <property name="visible">True</property>
2322 <property name="can_focus">True</property>2354 <property name="can_focus">True</property>
2323 <property name="label" translatable="yes">Beep every time a private message is received</property>2355 <property name="label" translatable="yes">_Beep every time a private message is received</property>
2324 <property name="use_underline">True</property>2356 <property name="use_underline">True</property>
2325 <property name="response_id">0</property>2357 <property name="response_id">0</property>
2326 <property name="draw_indicator">True</property>2358 <property name="draw_indicator">True</property>
@@ -2334,7 +2366,7 @@
2334 <widget class="GtkCheckButton" id="soundPMWindowCheckButton">2366 <widget class="GtkCheckButton" id="soundPMWindowCheckButton">
2335 <property name="visible">True</property>2367 <property name="visible">True</property>
2336 <property name="can_focus">True</property>2368 <property name="can_focus">True</property>
2337 <property name="label" translatable="yes">Beep when a private message window is opened</property>2369 <property name="label" translatable="yes">B_eep when a private message window is opened</property>
2338 <property name="use_underline">True</property>2370 <property name="use_underline">True</property>
2339 <property name="response_id">0</property>2371 <property name="response_id">0</property>
2340 <property name="draw_indicator">True</property>2372 <property name="draw_indicator">True</property>
@@ -2387,8 +2419,10 @@
2387 <child>2419 <child>
2388 <widget class="GtkLabel" id="label206">2420 <widget class="GtkLabel" id="label206">
2389 <property name="visible">True</property>2421 <property name="visible">True</property>
2390 <property name="label" translatable="yes">&lt;b&gt;Tab bolding on content change&lt;/b&gt;</property>2422 <property name="label" translatable="yes">&lt;b&gt;_Notifications&lt;/b&gt;</property>
2391 <property name="use_markup">True</property>2423 <property name="use_markup">True</property>
2424 <property name="use_underline">True</property>
2425 <property name="mnemonic_widget">tabBoldingTreeView</property>
2392 </widget>2426 </widget>
2393 <packing>2427 <packing>
2394 <property name="type">label_item</property>2428 <property name="type">label_item</property>
@@ -2399,19 +2433,6 @@
2399 <property name="position">2</property>2433 <property name="position">2</property>
2400 </packing>2434 </packing>
2401 </child>2435 </child>
2402 <child>
2403 <widget class="GtkLabel" id="label207">
2404 <property name="visible">True</property>
2405 <property name="xalign">0</property>
2406 <property name="yalign">0</property>
2407 <property name="label" translatable="yes">Note: Most of these options require that you restart the application</property>
2408 </widget>
2409 <packing>
2410 <property name="expand">False</property>
2411 <property name="fill">False</property>
2412 <property name="position">3</property>
2413 </packing>
2414 </child>
2415 </widget>2436 </widget>
2416 <packing>2437 <packing>
2417 <property name="position">1</property>2438 <property name="position">1</property>
@@ -2461,8 +2482,10 @@
2461 <child>2482 <child>
2462 <widget class="GtkLabel" id="label201">2483 <widget class="GtkLabel" id="label201">
2463 <property name="visible">True</property>2484 <property name="visible">True</property>
2464 <property name="label" translatable="yes">&lt;b&gt;Auto-open on startup&lt;/b&gt;</property>2485 <property name="label" translatable="yes">&lt;b&gt;_Auto-Open on Startup&lt;/b&gt;</property>
2465 <property name="use_markup">True</property>2486 <property name="use_markup">True</property>
2487 <property name="use_underline">True</property>
2488 <property name="mnemonic_widget">windowsAutoOpenTreeView</property>
2466 </widget>2489 </widget>
2467 <packing>2490 <packing>
2468 <property name="type">label_item</property>2491 <property name="type">label_item</property>
@@ -2499,8 +2522,10 @@
2499 <child>2522 <child>
2500 <widget class="GtkLabel" id="label202">2523 <widget class="GtkLabel" id="label202">
2501 <property name="visible">True</property>2524 <property name="visible">True</property>
2502 <property name="label" translatable="yes">&lt;b&gt;Window Options&lt;/b&gt;</property>2525 <property name="label" translatable="yes">&lt;b&gt;_Window Behavior&lt;/b&gt;</property>
2503 <property name="use_markup">True</property>2526 <property name="use_markup">True</property>
2527 <property name="use_underline">True</property>
2528 <property name="mnemonic_widget">windowsOptionsTreeView</property>
2504 </widget>2529 </widget>
2505 <packing>2530 <packing>
2506 <property name="type">label_item</property>2531 <property name="type">label_item</property>
@@ -2540,8 +2565,10 @@
2540 <child>2565 <child>
2541 <widget class="GtkLabel" id="label203">2566 <widget class="GtkLabel" id="label203">
2542 <property name="visible">True</property>2567 <property name="visible">True</property>
2543 <property name="label" translatable="yes">&lt;b&gt;Confirmation Dialog Options&lt;/b&gt;</property>2568 <property name="label" translatable="yes">&lt;b&gt;Confirmation _Dialog&lt;/b&gt;</property>
2544 <property name="use_markup">True</property>2569 <property name="use_markup">True</property>
2570 <property name="use_underline">True</property>
2571 <property name="mnemonic_widget">windowsConfirmTreeView</property>
2545 </widget>2572 </widget>
2546 <packing>2573 <packing>
2547 <property name="type">label_item</property>2574 <property name="type">label_item</property>
@@ -2560,7 +2587,7 @@
2560 <child>2587 <child>
2561 <widget class="GtkLabel" id="label198">2588 <widget class="GtkLabel" id="label198">
2562 <property name="visible">True</property>2589 <property name="visible">True</property>
2563 <property name="label" translatable="yes">Tabs</property>2590 <property name="label" translatable="yes">Window</property>
2564 </widget>2591 </widget>
2565 <packing>2592 <packing>
2566 <property name="type">tab</property>2593 <property name="type">tab</property>
@@ -2594,267 +2621,224 @@
2594 <property name="visible">True</property>2621 <property name="visible">True</property>
2595 <property name="label_xalign">0</property>2622 <property name="label_xalign">0</property>
2596 <child>2623 <child>
2597 <widget class="GtkVBox" id="vbox20">2624 <widget class="GtkTable" id="logTable">
2598 <property name="visible">True</property>2625 <property name="visible">True</property>
2599 <property name="border_width">8</property>2626 <property name="n_rows">8</property>
2600 <property name="spacing">4</property>2627 <property name="n_columns">2</property>
2601 <child>2628 <property name="column_spacing">15</property>
2602 <widget class="GtkHBox" id="hbox10">2629 <property name="row_spacing">20</property>
2603 <property name="visible">True</property>2630 <child>
2604 <property name="spacing">4</property>2631 <widget class="GtkLabel" id="outputDirectoryLabel">
2605 <child>2632 <property name="visible">True</property>
2606 <widget class="GtkLabel" id="label47">2633 <property name="xalign">0</property>
2607 <property name="visible">True</property>2634 <property name="label" translatable="yes">Ou_tput directory:</property>
2608 <property name="xalign">1</property>2635 <property name="use_underline">True</property>
2609 <property name="label" translatable="yes">Directory</property>2636 <property name="mnemonic_widget">logDirectoryFileChooserButton</property>
2610 </widget>2637 </widget>
2611 </child>2638 <packing>
2612 <child>2639 <property name="x_options">GTK_FILL</property>
2613 <widget class="GtkEntry" id="logDirectoryEntry">2640 <property name="y_options">GTK_FILL</property>
2614 <property name="width_request">226</property>2641 </packing>
2615 <property name="visible">True</property>2642 </child>
2616 <property name="can_focus">True</property>2643 <child>
2617 </widget>2644 <widget class="GtkFileChooserButton" id="logDirectoryFileChooserButton">
2618 <packing>2645 <property name="visible">True</property>
2619 <property name="position">1</property>2646 <property name="show_hidden">True</property>
2620 </packing>2647 <property name="local_only">False</property>
2621 </child>2648 <property name="action">select-folder</property>
2622 <child>2649 <property name="title" translatable="yes">Select a Folder</property>
2623 <widget class="GtkButton" id="logBrowseButton">2650 </widget>
2624 <property name="visible">True</property>2651 <packing>
2625 <property name="can_focus">True</property>2652 <property name="left_attach">1</property>
2626 <property name="label" translatable="yes">Browse...</property>2653 <property name="right_attach">2</property>
2627 <property name="use_underline">True</property>2654 <property name="y_options">GTK_FILL</property>
2628 <property name="response_id">0</property>
2629 </widget>
2630 <packing>
2631 <property name="expand">False</property>
2632 <property name="fill">False</property>
2633 <property name="position">2</property>
2634 </packing>
2635 </child>
2636 </widget>
2637 <packing>
2638 <property name="expand">False</property>
2639 </packing>2655 </packing>
2640 </child>2656 </child>
2641 <child>2657 <child>
2642 <widget class="GtkCheckButton" id="logMainCheckButton">2658 <widget class="GtkCheckButton" id="logMainCheckButton">
2659 <property name="label" translatable="yes">_Main chat format:</property>
2643 <property name="visible">True</property>2660 <property name="visible">True</property>
2644 <property name="can_focus">True</property>2661 <property name="can_focus">True</property>
2645 <property name="label" translatable="yes">Log main chat</property>2662 <property name="receives_default">False</property>
2646 <property name="use_underline">True</property>2663 <property name="use_underline">True</property>
2647 <property name="response_id">0</property>
2648 <property name="draw_indicator">True</property>2664 <property name="draw_indicator">True</property>
2649 </widget>2665 </widget>
2650 <packing>2666 <packing>
2651 <property name="expand">False</property>2667 <property name="top_attach">1</property>
2652 <property name="fill">False</property>2668 <property name="bottom_attach">2</property>
2653 <property name="position">1</property>2669 <property name="x_options">GTK_FILL</property>
2670 <property name="y_options">GTK_FILL</property>
2654 </packing>2671 </packing>
2655 </child>2672 </child>
2656 <child>2673 <child>
2657 <widget class="GtkHBox" id="hbox11">2674 <widget class="GtkEntry" id="logMainEntry">
2675 <property name="width_request">270</property>
2658 <property name="visible">True</property>2676 <property name="visible">True</property>
2659 <property name="spacing">4</property>2677 <property name="sensitive">False</property>
2660 <child>2678 <property name="can_focus">True</property>
2661 <widget class="GtkLabel" id="logMainLabel">2679 <property name="invisible_char">&#x25CF;</property>
2662 <property name="visible">True</property>
2663 <property name="sensitive">False</property>
2664 <property name="xalign">1</property>
2665 <property name="label" translatable="yes">Format</property>
2666 </widget>
2667 </child>
2668 <child>
2669 <widget class="GtkEntry" id="logMainEntry">
2670 <property name="width_request">270</property>
2671 <property name="visible">True</property>
2672 <property name="sensitive">False</property>
2673 <property name="can_focus">True</property>
2674 </widget>
2675 <packing>
2676 <property name="position">1</property>
2677 </packing>
2678 </child>
2679 </widget>2680 </widget>
2680 <packing>2681 <packing>
2681 <property name="position">2</property>2682 <property name="left_attach">1</property>
2683 <property name="right_attach">2</property>
2684 <property name="top_attach">1</property>
2685 <property name="bottom_attach">2</property>
2686 <property name="y_options">GTK_FILL</property>
2682 </packing>2687 </packing>
2683 </child>2688 </child>
2684 <child>2689 <child>
2685 <widget class="GtkCheckButton" id="logPrivateCheckButton">2690 <widget class="GtkCheckButton" id="logPrivateCheckButton">
2691 <property name="label" translatable="yes">_Private chat format:</property>
2686 <property name="visible">True</property>2692 <property name="visible">True</property>
2687 <property name="can_focus">True</property>2693 <property name="can_focus">True</property>
2688 <property name="label" translatable="yes">Log private chat</property>2694 <property name="receives_default">False</property>
2689 <property name="use_underline">True</property>2695 <property name="use_underline">True</property>
2690 <property name="response_id">0</property>
2691 <property name="draw_indicator">True</property>2696 <property name="draw_indicator">True</property>
2692 </widget>2697 </widget>
2693 <packing>2698 <packing>
2694 <property name="expand">False</property>2699 <property name="top_attach">2</property>
2695 <property name="fill">False</property>2700 <property name="bottom_attach">3</property>
2696 <property name="position">3</property>2701 <property name="x_options">GTK_FILL</property>
2702 <property name="y_options">GTK_FILL</property>
2697 </packing>2703 </packing>
2698 </child>2704 </child>
2699 <child>2705 <child>
2700 <widget class="GtkHBox" id="hbox12">2706 <widget class="GtkEntry" id="logPrivateEntry">
2707 <property name="width_request">270</property>
2701 <property name="visible">True</property>2708 <property name="visible">True</property>
2702 <property name="spacing">4</property>2709 <property name="sensitive">False</property>
2703 <child>2710 <property name="can_focus">True</property>
2704 <widget class="GtkLabel" id="logPrivateLabel">2711 <property name="invisible_char">&#x25CF;</property>
2705 <property name="visible">True</property>
2706 <property name="sensitive">False</property>
2707 <property name="xalign">1</property>
2708 <property name="label" translatable="yes">Format</property>
2709 </widget>
2710 </child>
2711 <child>
2712 <widget class="GtkEntry" id="logPrivateEntry">
2713 <property name="width_request">270</property>
2714 <property name="visible">True</property>
2715 <property name="sensitive">False</property>
2716 <property name="can_focus">True</property>
2717 </widget>
2718 <packing>
2719 <property name="position">1</property>
2720 </packing>
2721 </child>
2722 </widget>2712 </widget>
2723 <packing>2713 <packing>
2724 <property name="position">4</property>2714 <property name="left_attach">1</property>
2715 <property name="right_attach">2</property>
2716 <property name="top_attach">2</property>
2717 <property name="bottom_attach">3</property>
2718 <property name="y_options">GTK_FILL</property>
2725 </packing>2719 </packing>
2726 </child>2720 </child>
2727 <child>2721 <child>
2728 <widget class="GtkCheckButton" id="logDownloadsCheckButton">2722 <widget class="GtkCheckButton" id="logDownloadsCheckButton">
2723 <property name="label" translatable="yes">_Download format:</property>
2729 <property name="visible">True</property>2724 <property name="visible">True</property>
2730 <property name="can_focus">True</property>2725 <property name="can_focus">True</property>
2731 <property name="label" translatable="yes">Log downloads</property>2726 <property name="receives_default">False</property>
2732 <property name="use_underline">True</property>2727 <property name="use_underline">True</property>
2733 <property name="response_id">0</property>
2734 <property name="draw_indicator">True</property>2728 <property name="draw_indicator">True</property>
2735 </widget>2729 </widget>
2736 <packing>2730 <packing>
2737 <property name="expand">False</property>2731 <property name="top_attach">3</property>
2738 <property name="fill">False</property>2732 <property name="bottom_attach">4</property>
2739 <property name="position">5</property>2733 <property name="x_options">GTK_FILL</property>
2734 <property name="y_options">GTK_FILL</property>
2740 </packing>2735 </packing>
2741 </child>2736 </child>
2742 <child>2737 <child>
2743 <widget class="GtkHBox" id="hbox13">2738 <widget class="GtkEntry" id="logDownloadsEntry">
2739 <property name="width_request">270</property>
2744 <property name="visible">True</property>2740 <property name="visible">True</property>
2745 <property name="spacing">4</property>2741 <property name="sensitive">False</property>
2746 <child>2742 <property name="can_focus">True</property>
2747 <widget class="GtkLabel" id="logDownloadsLabel">2743 <property name="invisible_char">&#x25CF;</property>
2748 <property name="visible">True</property>
2749 <property name="sensitive">False</property>
2750 <property name="xalign">1</property>
2751 <property name="label" translatable="yes">Format</property>
2752 </widget>
2753 </child>
2754 <child>
2755 <widget class="GtkEntry" id="logDownloadsEntry">
2756 <property name="width_request">270</property>
2757 <property name="visible">True</property>
2758 <property name="sensitive">False</property>
2759 <property name="can_focus">True</property>
2760 </widget>
2761 <packing>
2762 <property name="position">1</property>
2763 </packing>
2764 </child>
2765 </widget>2744 </widget>
2766 <packing>2745 <packing>
2767 <property name="position">6</property>2746 <property name="left_attach">1</property>
2747 <property name="right_attach">2</property>
2748 <property name="top_attach">3</property>
2749 <property name="bottom_attach">4</property>
2750 <property name="y_options">GTK_FILL</property>
2768 </packing>2751 </packing>
2769 </child>2752 </child>
2770 <child>2753 <child>
2771 <widget class="GtkCheckButton" id="logUploadsCheckButton">2754 <widget class="GtkCheckButton" id="logUploadsCheckButton">
2755 <property name="label" translatable="yes">_Upload format:</property>
2772 <property name="visible">True</property>2756 <property name="visible">True</property>
2773 <property name="can_focus">True</property>2757 <property name="can_focus">True</property>
2774 <property name="label" translatable="yes">Log uploads</property>2758 <property name="receives_default">False</property>
2775 <property name="use_underline">True</property>2759 <property name="use_underline">True</property>
2776 <property name="response_id">0</property>
2777 <property name="draw_indicator">True</property>2760 <property name="draw_indicator">True</property>
2778 </widget>2761 </widget>
2779 <packing>2762 <packing>
2780 <property name="expand">False</property>2763 <property name="top_attach">4</property>
2781 <property name="fill">False</property>2764 <property name="bottom_attach">5</property>
2782 <property name="position">7</property>2765 <property name="x_options">GTK_FILL</property>
2766 <property name="y_options">GTK_FILL</property>
2783 </packing>2767 </packing>
2784 </child>2768 </child>
2785 <child>2769 <child>
2786 <widget class="GtkHBox" id="hbox14">2770 <widget class="GtkEntry" id="logUploadsEntry">
2771 <property name="width_request">270</property>
2787 <property name="visible">True</property>2772 <property name="visible">True</property>
2788 <property name="spacing">4</property>2773 <property name="sensitive">False</property>
2789 <child>2774 <property name="can_focus">True</property>
2790 <widget class="GtkLabel" id="logUploadsLabel">2775 <property name="invisible_char">&#x25CF;</property>
2791 <property name="visible">True</property>
2792 <property name="sensitive">False</property>
2793 <property name="xalign">1</property>
2794 <property name="label" translatable="yes">Format</property>
2795 </widget>
2796 </child>
2797 <child>
2798 <widget class="GtkEntry" id="logUploadsEntry">
2799 <property name="width_request">270</property>
2800 <property name="visible">True</property>
2801 <property name="sensitive">False</property>
2802 <property name="can_focus">True</property>
2803 </widget>
2804 <packing>
2805 <property name="position">1</property>
2806 </packing>
2807 </child>
2808 </widget>2776 </widget>
2809 <packing>2777 <packing>
2810 <property name="position">8</property>2778 <property name="left_attach">1</property>
2779 <property name="right_attach">2</property>
2780 <property name="top_attach">4</property>
2781 <property name="bottom_attach">5</property>
2782 <property name="y_options">GTK_FILL</property>
2811 </packing>2783 </packing>
2812 </child>2784 </child>
2813 <child>2785 <child>
2814 <widget class="GtkCheckButton" id="logSystemCheckButton">2786 <widget class="GtkCheckButton" id="logSystemCheckButton">
2787 <property name="label" translatable="yes">_System messages</property>
2815 <property name="visible">True</property>2788 <property name="visible">True</property>
2816 <property name="can_focus">True</property>2789 <property name="can_focus">True</property>
2817 <property name="label" translatable="yes">Log system messages</property>2790 <property name="receives_default">False</property>
2818 <property name="use_underline">True</property>2791 <property name="use_underline">True</property>
2819 <property name="response_id">0</property>
2820 <property name="draw_indicator">True</property>2792 <property name="draw_indicator">True</property>
2821 </widget>2793 </widget>
2822 <packing>2794 <packing>
2823 <property name="expand">False</property>2795 <property name="top_attach">5</property>
2824 <property name="fill">False</property>2796 <property name="bottom_attach">6</property>
2825 <property name="position">9</property>2797 <property name="x_options">GTK_FILL</property>
2798 <property name="y_options">GTK_FILL</property>
2826 </packing>2799 </packing>
2827 </child>2800 </child>
2828 <child>2801 <child>
2829 <widget class="GtkCheckButton" id="logStatusCheckButton">2802 <widget class="GtkCheckButton" id="logStatusCheckButton">
2803 <property name="label" translatable="yes">St_atus messages</property>
2830 <property name="visible">True</property>2804 <property name="visible">True</property>
2831 <property name="can_focus">True</property>2805 <property name="can_focus">True</property>
2832 <property name="label" translatable="yes">Log status messages</property>2806 <property name="receives_default">False</property>
2833 <property name="use_underline">True</property>2807 <property name="use_underline">True</property>
2834 <property name="response_id">0</property>
2835 <property name="draw_indicator">True</property>2808 <property name="draw_indicator">True</property>
2836 </widget>2809 </widget>
2837 <packing>2810 <packing>
2838 <property name="expand">False</property>2811 <property name="top_attach">6</property>
2839 <property name="fill">False</property>2812 <property name="bottom_attach">7</property>
2840 <property name="position">10</property>2813 <property name="x_options">GTK_FILL</property>
2814 <property name="y_options">GTK_FILL</property>
2841 </packing>2815 </packing>
2842 </child>2816 </child>
2843 <child>2817 <child>
2844 <widget class="GtkCheckButton" id="logFilelistTransfersCheckButton">2818 <widget class="GtkCheckButton" id="logFilelistTransfersCheckButton">
2819 <property name="label" translatable="yes">_File list transfers</property>
2845 <property name="visible">True</property>2820 <property name="visible">True</property>
2846 <property name="can_focus">True</property>2821 <property name="can_focus">True</property>
2847 <property name="label" translatable="yes">Log filelist transfers</property>2822 <property name="receives_default">False</property>
2848 <property name="use_underline">True</property>2823 <property name="use_underline">True</property>
2849 <property name="response_id">0</property>
2850 <property name="draw_indicator">True</property>2824 <property name="draw_indicator">True</property>
2851 </widget>2825 </widget>
2852 <packing>2826 <packing>
2853 <property name="expand">False</property>2827 <property name="top_attach">7</property>
2854 <property name="fill">False</property>2828 <property name="bottom_attach">8</property>
2855 <property name="position">11</property>2829 <property name="x_options">GTK_FILL</property>
2830 <property name="y_options">GTK_FILL</property>
2856 </packing>2831 </packing>
2857 </child>2832 </child>
2833 <child>
2834 <placeholder/>
2835 </child>
2836 <child>
2837 <placeholder/>
2838 </child>
2839 <child>
2840 <placeholder/>
2841 </child>
2858 </widget>2842 </widget>
2859 </child>2843 </child>
2860 <child>2844 <child>
@@ -2877,7 +2861,7 @@
2877 <child>2861 <child>
2878 <widget class="GtkLabel" id="label5">2862 <widget class="GtkLabel" id="label5">
2879 <property name="visible">True</property>2863 <property name="visible">True</property>
2880 <property name="label" translatable="yes">Logs</property>2864 <property name="label" translatable="yes">Logging</property>
2881 </widget>2865 </widget>
2882 <packing>2866 <packing>
2883 <property name="type">tab</property>2867 <property name="type">tab</property>
@@ -3039,480 +3023,445 @@
3039 </packing>3023 </packing>
3040 </child>3024 </child>
3041 <child>3025 <child>
3042 <widget class="GtkVBox" id="vbox56">3026 <widget class="GtkTable" id="expertsOnlyTable">
3043 <property name="visible">True</property>3027 <property name="visible">True</property>
3044 <property name="border_width">8</property>3028 <property name="n_rows">11</property>
3045 <property name="spacing">4</property>3029 <property name="n_columns">3</property>
3046 <child>3030 <property name="column_spacing">10</property>
3047 <widget class="GtkHBox" id="hbox19">3031 <child>
3048 <property name="visible">True</property>3032 <widget class="GtkLabel" id="autoRefreshLabel">
3049 <property name="spacing">4</property>3033 <property name="visible">True</property>
3050 <child>3034 <property name="xalign">0</property>
3051 <widget class="GtkVBox" id="vbox61">3035 <property name="label" translatable="yes">Auto refresh _time:</property>
3052 <property name="visible">True</property>3036 <property name="use_underline">True</property>
3053 <property name="spacing">4</property>3037 <property name="mnemonic_widget">autoRefreshSpinButton</property>
3054 <property name="homogeneous">True</property>3038 </widget>
3055 <child>3039 <packing>
3056 <widget class="GtkLabel" id="label157">3040 <property name="x_options">GTK_FILL</property>
3057 <property name="visible">True</property>3041 </packing>
3058 <property name="xalign">1</property>3042 </child>
3059 <property name="label" translatable="yes">Max hash speed</property>3043 <child>
3060 </widget>3044 <widget class="GtkSpinButton" id="autoRefreshSpinButton">
3061 <packing>3045 <property name="visible">True</property>
3062 <property name="expand">False</property>3046 <property name="can_focus">True</property>
3063 <property name="fill">False</property>3047 <property name="invisible_char">&#x25CF;</property>
3064 <property name="position">1</property>3048 <property name="adjustment">1 0 100 1 10 0</property>
3065 </packing>3049 <property name="climb_rate">1</property>
3066 </child>3050 <property name="numeric">True</property>
3067 <child>3051 </widget>
3068 <widget class="GtkLabel" id="label158">3052 <packing>
3069 <property name="visible">True</property>3053 <property name="left_attach">1</property>
3070 <property name="xalign">1</property>3054 <property name="right_attach">2</property>
3071 <property name="label" translatable="yes">PM history</property>3055 <property name="x_options">GTK_FILL</property>
3072 </widget>3056 </packing>
3073 <packing>3057 </child>
3074 <property name="expand">False</property>3058 <child>
3075 <property name="fill">False</property>3059 <widget class="GtkLabel" id="label167">
3076 <property name="position">2</property>3060 <property name="visible">True</property>
3077 </packing>3061 <property name="xalign">0</property>
3078 </child>3062 <property name="label" translatable="yes">s</property>
3079 <child>3063 </widget>
3080 <widget class="GtkLabel" id="label159">3064 <packing>
3081 <property name="visible">True</property>3065 <property name="left_attach">2</property>
3082 <property name="xalign">1</property>3066 <property name="right_attach">3</property>
3083 <property name="label" translatable="yes">Mini slot size</property>3067 </packing>
3084 </widget>3068 </child>
3085 <packing>3069 <child>
3086 <property name="expand">False</property>3070 <widget class="GtkLabel" id="bindAddressLabel">
3087 <property name="fill">False</property>3071 <property name="visible">True</property>
3088 <property name="position">3</property>3072 <property name="xalign">0</property>
3089 </packing>3073 <property name="label" translatable="yes">_Bind address:</property>
3090 </child>3074 <property name="use_underline">True</property>
3091 <child>3075 <property name="mnemonic_widget">bindAddressEntry</property>
3092 <widget class="GtkLabel" id="label160">3076 </widget>
3093 <property name="visible">True</property>3077 <packing>
3094 <property name="xalign">1</property>3078 <property name="top_attach">1</property>
3095 <property name="label" translatable="yes">Max filelist size</property>3079 <property name="bottom_attach">2</property>
3096 </widget>3080 <property name="x_options">GTK_FILL</property>
3097 <packing>3081 </packing>
3098 <property name="expand">False</property>3082 </child>
3099 <property name="fill">False</property>3083 <child>
3100 <property name="position">4</property>3084 <widget class="GtkEntry" id="bindAddressEntry">
3101 </packing>3085 <property name="visible">True</property>
3102 </child>3086 <property name="can_focus">True</property>
3103 <child>3087 <property name="invisible_char">&#x25CF;</property>
3104 <widget class="GtkLabel" id="label161">3088 </widget>
3105 <property name="visible">True</property>3089 <packing>
3106 <property name="xalign">1</property>3090 <property name="left_attach">1</property>
3107 <property name="label" translatable="yes">CID</property>3091 <property name="right_attach">2</property>
3108 </widget>3092 <property name="top_attach">1</property>
3109 <packing>3093 <property name="bottom_attach">2</property>
3110 <property name="expand">False</property>3094 <property name="x_options">GTK_FILL</property>
3111 <property name="fill">False</property>3095 </packing>
3112 <property name="position">5</property>3096 </child>
3113 </packing>3097 <child>
3114 </child>3098 <widget class="GtkLabel" id="cidLabel">
3115 </widget>3099 <property name="visible">True</property>
3116 <packing>3100 <property name="xalign">0</property>
3117 <property name="expand">False</property>3101 <property name="label" translatable="yes">CI_D:</property>
3118 <property name="fill">False</property>3102 <property name="use_underline">True</property>
3119 </packing>3103 <property name="mnemonic_widget">CIDEntry</property>
3120 </child>3104 </widget>
3121 <child>3105 <packing>
3122 <widget class="GtkVBox" id="vbox62">3106 <property name="top_attach">2</property>
3123 <property name="visible">True</property>3107 <property name="bottom_attach">3</property>
3124 <property name="spacing">4</property>3108 <property name="x_options">GTK_FILL</property>
3125 <property name="homogeneous">True</property>3109 </packing>
3126 <child>3110 </child>
3127 <widget class="GtkSpinButton" id="hashSpeedSpinButton">3111 <child>
3128 <property name="visible">True</property>3112 <widget class="GtkEntry" id="CIDEntry">
3129 <property name="can_focus">True</property>3113 <property name="visible">True</property>
3130 <property name="adjustment">0 0 102400 1 64 0</property>3114 <property name="can_focus">True</property>
3131 <property name="climb_rate">1</property>3115 <property name="invisible_char">&#x25CF;</property>
3132 <property name="numeric">True</property>3116 </widget>
3133 </widget>3117 <packing>
3134 <packing>3118 <property name="left_attach">1</property>
3135 <property name="expand">False</property>3119 <property name="right_attach">2</property>
3136 <property name="fill">False</property>3120 <property name="top_attach">2</property>
3137 <property name="position">1</property>3121 <property name="bottom_attach">3</property>
3138 </packing>3122 <property name="x_options">GTK_FILL</property>
3139 </child>3123 </packing>
3140 <child>3124 </child>
3141 <widget class="GtkSpinButton" id="pmHistorySpinButton">3125 <child>
3142 <property name="visible">True</property>3126 <widget class="GtkLabel" id="maxListSizeLabel">
3143 <property name="can_focus">True</property>3127 <property name="visible">True</property>
3144 <property name="adjustment">10 0 100 1 10 0</property>3128 <property name="xalign">0</property>
3145 <property name="climb_rate">1</property>3129 <property name="label" translatable="yes">Maximum _file list size:</property>
3146 <property name="numeric">True</property>3130 <property name="use_underline">True</property>
3147 </widget>3131 <property name="mnemonic_widget">maxListSizeSpinButton</property>
3148 <packing>3132 </widget>
3149 <property name="expand">False</property>3133 <packing>
3150 <property name="fill">False</property>3134 <property name="top_attach">3</property>
3151 <property name="position">2</property>3135 <property name="bottom_attach">4</property>
3152 </packing>3136 <property name="x_options">GTK_FILL</property>
3153 </child>3137 </packing>
3154 <child>3138 </child>
3155 <widget class="GtkSpinButton" id="slotSizeSpinButton">3139 <child>
3156 <property name="visible">True</property>3140 <widget class="GtkSpinButton" id="maxListSizeSpinButton">
3157 <property name="can_focus">True</property>3141 <property name="visible">True</property>
3158 <property name="adjustment">64 0 10240 1 10 0</property>3142 <property name="can_focus">True</property>
3159 <property name="climb_rate">1</property>3143 <property name="invisible_char">&#x25CF;</property>
3160 <property name="numeric">True</property>3144 <property name="adjustment">0 0 1000 1 10 0</property>
3161 </widget>3145 <property name="climb_rate">1</property>
3162 <packing>3146 <property name="numeric">True</property>
3163 <property name="expand">False</property>3147 </widget>
3164 <property name="fill">False</property>3148 <packing>
3165 <property name="position">3</property>3149 <property name="left_attach">1</property>
3166 </packing>3150 <property name="right_attach">2</property>
3167 </child>3151 <property name="top_attach">3</property>
3168 <child>3152 <property name="bottom_attach">4</property>
3169 <widget class="GtkSpinButton" id="maxListSizeSpinButton">3153 <property name="x_options">GTK_FILL</property>
3170 <property name="visible">True</property>3154 </packing>
3171 <property name="can_focus">True</property>3155 </child>
3172 <property name="adjustment">0 0 1000 1 10 0</property>3156 <child>
3173 <property name="climb_rate">1</property>3157 <widget class="GtkLabel" id="label169">
3174 <property name="numeric">True</property>3158 <property name="visible">True</property>
3175 </widget>3159 <property name="xalign">0</property>
3176 <packing>3160 <property name="label" translatable="yes">MiB</property>
3177 <property name="expand">False</property>3161 </widget>
3178 <property name="fill">False</property>3162 <packing>
3179 <property name="position">4</property>3163 <property name="left_attach">2</property>
3180 </packing>3164 <property name="right_attach">3</property>
3181 </child>3165 <property name="top_attach">3</property>
3182 <child>3166 <property name="bottom_attach">4</property>
3183 <widget class="GtkEntry" id="CIDEntry">3167 </packing>
3184 <property name="visible">True</property>3168 </child>
3185 <property name="can_focus">True</property>3169 <child>
3186 </widget>3170 <widget class="GtkLabel" id="hashSpeedLabel">
3187 <packing>3171 <property name="visible">True</property>
3188 <property name="expand">False</property>3172 <property name="xalign">0</property>
3189 <property name="fill">False</property>3173 <property name="label" translatable="yes">Maximum _hash speed:</property>
3190 <property name="position">5</property>3174 <property name="use_underline">True</property>
3191 </packing>3175 <property name="mnemonic_widget">hashSpeedSpinButton</property>
3192 </child>3176 </widget>
3193 </widget>3177 <packing>
3194 <packing>3178 <property name="top_attach">4</property>
3195 <property name="expand">False</property>3179 <property name="bottom_attach">5</property>
3196 <property name="fill">False</property>3180 <property name="x_options">GTK_FILL</property>
3197 <property name="position">1</property>3181 </packing>
3198 </packing>3182 </child>
3199 </child>3183 <child>
3200 <child>3184 <widget class="GtkSpinButton" id="hashSpeedSpinButton">
3201 <widget class="GtkVBox" id="vbox63">3185 <property name="visible">True</property>
3202 <property name="visible">True</property>3186 <property name="can_focus">True</property>
3203 <property name="spacing">4</property>3187 <property name="invisible_char">&#x25CF;</property>
3204 <property name="homogeneous">True</property>3188 <property name="adjustment">0 0 102400 1 64 0</property>
3205 <child>3189 <property name="climb_rate">1</property>
3206 <widget class="GtkLabel" id="label154">3190 <property name="numeric">True</property>
3207 <property name="visible">True</property>3191 </widget>
3208 <property name="xalign">0</property>3192 <packing>
3209 <property name="label" translatable="yes">MiB/s</property>3193 <property name="left_attach">1</property>
3210 </widget>3194 <property name="right_attach">2</property>
3211 <packing>3195 <property name="top_attach">4</property>
3212 <property name="expand">False</property>3196 <property name="bottom_attach">5</property>
3213 <property name="fill">False</property>3197 <property name="x_options">GTK_FILL</property>
3214 <property name="position">1</property>3198 </packing>
3215 </packing>3199 </child>
3216 </child>3200 <child>
3217 <child>3201 <widget class="GtkLabel" id="label154">
3218 <widget class="GtkLabel" id="label208">3202 <property name="visible">True</property>
3219 <property name="visible">True</property>3203 <property name="xalign">0</property>
3220 </widget>3204 <property name="label" translatable="yes">MiB/s</property>
3221 <packing>3205 </widget>
3222 <property name="expand">False</property>3206 <packing>
3223 <property name="fill">False</property>3207 <property name="left_attach">2</property>
3224 <property name="position">2</property>3208 <property name="right_attach">3</property>
3225 </packing>3209 <property name="top_attach">4</property>
3226 </child>3210 <property name="bottom_attach">5</property>
3227 <child>3211 </packing>
3228 <widget class="GtkLabel" id="label168">3212 </child>
3229 <property name="visible">True</property>3213 <child>
3230 <property name="xalign">0</property>3214 <widget class="GtkLabel" id="slotSizeLabel">
3231 <property name="label" translatable="yes">KiB</property>3215 <property name="visible">True</property>
3232 </widget>3216 <property name="xalign">0</property>
3233 <packing>3217 <property name="label" translatable="yes">_Mini slot size:</property>
3234 <property name="expand">False</property>3218 <property name="use_underline">True</property>
3235 <property name="fill">False</property>3219 <property name="mnemonic_widget">slotSizeSpinButton</property>
3236 <property name="position">3</property>3220 </widget>
3237 </packing>3221 <packing>
3238 </child>3222 <property name="top_attach">5</property>
3239 <child>3223 <property name="bottom_attach">6</property>
3240 <widget class="GtkLabel" id="label169">3224 <property name="x_options">GTK_FILL</property>
3241 <property name="visible">True</property>3225 </packing>
3242 <property name="xalign">0</property>3226 </child>
3243 <property name="label" translatable="yes">MiB</property>3227 <child>
3244 </widget>3228 <widget class="GtkSpinButton" id="slotSizeSpinButton">
3245 <packing>3229 <property name="visible">True</property>
3246 <property name="expand">False</property>3230 <property name="can_focus">True</property>
3247 <property name="fill">False</property>3231 <property name="invisible_char">&#x25CF;</property>
3248 <property name="position">4</property>3232 <property name="adjustment">64 0 10240 1 10 0</property>
3249 </packing>3233 <property name="climb_rate">1</property>
3250 </child>3234 <property name="numeric">True</property>
3251 <child>3235 </widget>
3252 <widget class="GtkLabel" id="label209">3236 <packing>
3253 <property name="visible">True</property>3237 <property name="left_attach">1</property>
3254 </widget>3238 <property name="right_attach">2</property>
3255 <packing>3239 <property name="top_attach">5</property>
3256 <property name="expand">False</property>3240 <property name="bottom_attach">6</property>
3257 <property name="fill">False</property>3241 <property name="x_options">GTK_FILL</property>
3258 <property name="position">5</property>3242 </packing>
3259 </packing>3243 </child>
3260 </child>3244 <child>
3261 </widget>3245 <widget class="GtkLabel" id="label168">
3262 <packing>3246 <property name="visible">True</property>
3263 <property name="position">2</property>3247 <property name="xalign">0</property>
3264 </packing>3248 <property name="label" translatable="yes">KiB</property>
3265 </child>3249 </widget>
3266 <child>3250 <packing>
3267 <widget class="GtkVBox" id="vbox64">3251 <property name="left_attach">2</property>
3268 <property name="visible">True</property>3252 <property name="right_attach">3</property>
3269 <property name="spacing">4</property>3253 <property name="top_attach">5</property>
3270 <property name="homogeneous">True</property>3254 <property name="bottom_attach">6</property>
3271 <child>3255 </packing>
3272 <widget class="GtkLabel" id="label156">3256 </child>
3273 <property name="visible">True</property>3257 <child>
3274 <property name="xalign">1</property>3258 <widget class="GtkLabel" id="pmHistoryLabel">
3275 <property name="label" translatable="yes">Write buffer size</property>3259 <property name="visible">True</property>
3276 </widget>3260 <property name="xalign">0</property>
3277 <packing>3261 <property name="label" translatable="yes">_Private message history:</property>
3278 <property name="expand">False</property>3262 <property name="use_underline">True</property>
3279 <property name="fill">False</property>3263 <property name="mnemonic_widget">pmHistorySpinButton</property>
3280 </packing>3264 </widget>
3281 </child>3265 <packing>
3282 <child>3266 <property name="top_attach">6</property>
3283 <widget class="GtkLabel" id="label166">3267 <property name="bottom_attach">7</property>
3284 <property name="visible">True</property>3268 <property name="x_options">GTK_FILL</property>
3285 <property name="xalign">1</property>3269 </packing>
3286 <property name="label" translatable="yes">Search history</property>3270 </child>
3287 </widget>3271 <child>
3288 <packing>3272 <widget class="GtkSpinButton" id="pmHistorySpinButton">
3289 <property name="expand">False</property>3273 <property name="visible">True</property>
3290 <property name="fill">False</property>3274 <property name="can_focus">True</property>
3291 <property name="position">1</property>3275 <property name="invisible_char">&#x25CF;</property>
3292 </packing>3276 <property name="adjustment">10 0 100 1 10 0</property>
3293 </child>3277 <property name="climb_rate">1</property>
3294 <child>3278 <property name="numeric">True</property>
3295 <widget class="GtkLabel" id="label165">3279 </widget>
3296 <property name="visible">True</property>3280 <packing>
3297 <property name="xalign">1</property>3281 <property name="left_attach">1</property>
3298 <property name="label" translatable="yes">Bind address</property>3282 <property name="right_attach">2</property>
3299 </widget>3283 <property name="top_attach">6</property>
3300 <packing>3284 <property name="bottom_attach">7</property>
3301 <property name="expand">False</property>3285 <property name="x_options">GTK_FILL</property>
3302 <property name="fill">False</property>3286 </packing>
3303 <property name="position">2</property>3287 </child>
3304 </packing>3288 <child>
3305 </child>3289 <widget class="GtkLabel" id="searchHistoryLabel">
3306 <child>3290 <property name="visible">True</property>
3307 <widget class="GtkLabel" id="label164">3291 <property name="xalign">0</property>
3308 <property name="visible">True</property>3292 <property name="label" translatable="yes">_Search history:</property>
3309 <property name="xalign">1</property>3293 <property name="use_underline">True</property>
3310 <property name="label" translatable="yes">Socket read buffer</property>3294 <property name="mnemonic_widget">searchHistorySpinButton</property>
3311 </widget>3295 </widget>
3312 <packing>3296 <packing>
3313 <property name="expand">False</property>3297 <property name="top_attach">7</property>
3314 <property name="fill">False</property>3298 <property name="bottom_attach">8</property>
3315 <property name="position">3</property>3299 <property name="x_options">GTK_FILL</property>
3316 </packing>3300 </packing>
3317 </child>3301 </child>
3318 <child>3302 <child>
3319 <widget class="GtkLabel" id="label163">3303 <widget class="GtkSpinButton" id="searchHistorySpinButton">
3320 <property name="visible">True</property>3304 <property name="visible">True</property>
3321 <property name="xalign">1</property>3305 <property name="can_focus">True</property>
3322 <property name="label" translatable="yes">Socket write buffer</property>3306 <property name="invisible_char">&#x25CF;</property>
3323 </widget>3307 <property name="adjustment">10 0 100 1 10 0</property>
3324 <packing>3308 <property name="climb_rate">1</property>
3325 <property name="expand">False</property>3309 <property name="numeric">True</property>
3326 <property name="fill">False</property>3310 </widget>
3327 <property name="position">4</property>3311 <packing>
3328 </packing>3312 <property name="left_attach">1</property>
3329 </child>3313 <property name="right_attach">2</property>
3330 <child>3314 <property name="top_attach">7</property>
3331 <widget class="GtkLabel" id="label162">3315 <property name="bottom_attach">8</property>
3332 <property name="visible">True</property>3316 <property name="x_options">GTK_FILL</property>
3333 <property name="xalign">1</property>3317 </packing>
3334 <property name="label" translatable="yes">Auto refresh time</property>3318 </child>
3335 </widget>3319 <child>
3336 <packing>3320 <widget class="GtkLabel" id="socketReadLabel">
3337 <property name="expand">False</property>3321 <property name="visible">True</property>
3338 <property name="fill">False</property>3322 <property name="xalign">0</property>
3339 <property name="position">5</property>3323 <property name="label" translatable="yes">Socket _read buffer:</property>
3340 </packing>3324 <property name="use_underline">True</property>
3341 </child>3325 <property name="mnemonic_widget">socketReadSpinButton</property>
3342 </widget>3326 </widget>
3343 <packing>3327 <packing>
3344 <property name="position">3</property>3328 <property name="top_attach">8</property>
3345 </packing>3329 <property name="bottom_attach">9</property>
3346 </child>3330 <property name="x_options">GTK_FILL</property>
3347 <child>3331 </packing>
3348 <widget class="GtkVBox" id="vbox65">3332 </child>
3349 <property name="visible">True</property>3333 <child>
3350 <property name="spacing">4</property>3334 <widget class="GtkSpinButton" id="socketReadSpinButton">
3351 <property name="homogeneous">True</property>3335 <property name="visible">True</property>
3352 <child>3336 <property name="can_focus">True</property>
3353 <widget class="GtkSpinButton" id="writeBufferSpinButton">3337 <property name="invisible_char">&#x25CF;</property>
3354 <property name="visible">True</property>3338 <property name="adjustment">0 0 102400 1 64 0</property>
3355 <property name="can_focus">True</property>3339 <property name="climb_rate">1</property>
3356 <property name="adjustment">0 0 1024 64 10 0</property>3340 <property name="numeric">True</property>
3357 <property name="climb_rate">1</property>3341 </widget>
3358 <property name="numeric">True</property>3342 <packing>
3359 </widget>3343 <property name="left_attach">1</property>
3360 <packing>3344 <property name="right_attach">2</property>
3361 <property name="expand">False</property>3345 <property name="top_attach">8</property>
3362 <property name="fill">False</property>3346 <property name="bottom_attach">9</property>
3363 </packing>3347 <property name="x_options">GTK_FILL</property>
3364 </child>3348 </packing>
3365 <child>3349 </child>
3366 <widget class="GtkSpinButton" id="searchHistorySpinButton">3350 <child>
3367 <property name="visible">True</property>3351 <widget class="GtkLabel" id="label170">
3368 <property name="can_focus">True</property>3352 <property name="visible">True</property>
3369 <property name="adjustment">10 0 100 1 10 0</property>3353 <property name="xalign">0</property>
3370 <property name="climb_rate">1</property>3354 <property name="label" translatable="yes">B</property>
3371 <property name="numeric">True</property>3355 </widget>
3372 </widget>3356 <packing>
3373 <packing>3357 <property name="left_attach">2</property>
3374 <property name="expand">False</property>3358 <property name="right_attach">3</property>
3375 <property name="fill">False</property>3359 <property name="top_attach">8</property>
3376 <property name="position">1</property>3360 <property name="bottom_attach">9</property>
3377 </packing>3361 </packing>
3378 </child>3362 </child>
3379 <child>3363 <child>
3380 <widget class="GtkEntry" id="bindAddressEntry">3364 <widget class="GtkLabel" id="socketWriteLabel">
3381 <property name="visible">True</property>3365 <property name="visible">True</property>
3382 <property name="can_focus">True</property>3366 <property name="xalign">0</property>
3383 </widget>3367 <property name="label" translatable="yes">Socket _write buffer:</property>
3384 <packing>3368 <property name="use_underline">True</property>
3385 <property name="expand">False</property>3369 <property name="mnemonic_widget">socketWriteSpinButton</property>
3386 <property name="fill">False</property>3370 </widget>
3387 <property name="position">2</property>3371 <packing>
3388 </packing>3372 <property name="top_attach">9</property>
3389 </child>3373 <property name="bottom_attach">10</property>
3390 <child>3374 <property name="x_options">GTK_FILL</property>
3391 <widget class="GtkSpinButton" id="socketReadSpinButton">3375 </packing>
3392 <property name="visible">True</property>3376 </child>
3393 <property name="can_focus">True</property>3377 <child>
3394 <property name="adjustment">0 0 102400 1 64 0</property>3378 <widget class="GtkSpinButton" id="socketWriteSpinButton">
3395 <property name="climb_rate">1</property>3379 <property name="visible">True</property>
3396 <property name="numeric">True</property>3380 <property name="can_focus">True</property>
3397 </widget>3381 <property name="invisible_char">&#x25CF;</property>
3398 <packing>3382 <property name="adjustment">0 0 102400 1 64 0</property>
3399 <property name="expand">False</property>3383 <property name="climb_rate">1</property>
3400 <property name="fill">False</property>3384 <property name="numeric">True</property>
3401 <property name="position">3</property>3385 </widget>
3402 </packing>3386 <packing>
3403 </child>3387 <property name="left_attach">1</property>
3404 <child>3388 <property name="right_attach">2</property>
3405 <widget class="GtkSpinButton" id="socketWriteSpinButton">3389 <property name="top_attach">9</property>
3406 <property name="visible">True</property>3390 <property name="bottom_attach">10</property>
3407 <property name="can_focus">True</property>3391 <property name="x_options">GTK_FILL</property>
3408 <property name="adjustment">0 0 102400 1 64 0</property>3392 </packing>
3409 <property name="climb_rate">1</property>3393 </child>
3410 <property name="numeric">True</property>3394 <child>
3411 </widget>3395 <widget class="GtkLabel" id="label171">
3412 <packing>3396 <property name="visible">True</property>
3413 <property name="expand">False</property>3397 <property name="xalign">0</property>
3414 <property name="fill">False</property>3398 <property name="label" translatable="yes">B</property>
3415 <property name="position">4</property>3399 </widget>
3416 </packing>3400 <packing>
3417 </child>3401 <property name="left_attach">2</property>
3418 <child>3402 <property name="right_attach">3</property>
3419 <widget class="GtkSpinButton" id="autoRefreshSpinButton">3403 <property name="top_attach">9</property>
3420 <property name="visible">True</property>3404 <property name="bottom_attach">10</property>
3421 <property name="can_focus">True</property>3405 </packing>
3422 <property name="adjustment">1 0 100 1 10 0</property>3406 </child>
3423 <property name="climb_rate">1</property>3407 <child>
3424 <property name="numeric">True</property>3408 <widget class="GtkLabel" id="writeBufferLabel">
3425 </widget>3409 <property name="visible">True</property>
3426 <packing>3410 <property name="xalign">0</property>
3427 <property name="expand">False</property>3411 <property name="label" translatable="yes">Wr_ite buffer size:</property>
3428 <property name="fill">False</property>3412 <property name="use_underline">True</property>
3429 <property name="position">5</property>3413 <property name="mnemonic_widget">writeBufferSpinButton</property>
3430 </packing>3414 </widget>
3431 </child>3415 <packing>
3432 </widget>3416 <property name="top_attach">10</property>
3433 <packing>3417 <property name="bottom_attach">11</property>
3434 <property name="expand">False</property>3418 <property name="x_options">GTK_FILL</property>
3435 <property name="fill">False</property>3419 </packing>
3436 <property name="position">4</property>3420 </child>
3437 </packing>3421 <child>
3438 </child>3422 <widget class="GtkSpinButton" id="writeBufferSpinButton">
3439 <child>3423 <property name="visible">True</property>
3440 <widget class="GtkVBox" id="vbox66">3424 <property name="can_focus">True</property>
3441 <property name="visible">True</property>3425 <property name="invisible_char">&#x25CF;</property>
3442 <property name="spacing">4</property>3426 <property name="adjustment">0 0 1024 64 10 0</property>
3443 <property name="homogeneous">True</property>3427 <property name="climb_rate">1</property>
3444 <child>3428 <property name="numeric">True</property>
3445 <widget class="GtkLabel" id="label155">3429 </widget>
3446 <property name="visible">True</property>3430 <packing>
3447 <property name="xalign">0</property>3431 <property name="left_attach">1</property>
3448 <property name="label" translatable="yes">KiB</property>3432 <property name="right_attach">2</property>
3449 </widget>3433 <property name="top_attach">10</property>
3450 <packing>3434 <property name="bottom_attach">11</property>
3451 <property name="expand">False</property>3435 <property name="x_options">GTK_FILL</property>
3452 <property name="fill">False</property>3436 </packing>
3453 </packing>3437 </child>
3454 </child>3438 <child>
3455 <child>3439 <widget class="GtkLabel" id="label155">
3456 <widget class="GtkLabel" id="label14">3440 <property name="visible">True</property>
3457 <property name="visible">True</property>3441 <property name="xalign">0</property>
3458 </widget>3442 <property name="label" translatable="yes">KiB</property>
3459 <packing>3443 </widget>
3460 <property name="position">1</property>3444 <packing>
3461 </packing>3445 <property name="left_attach">2</property>
3462 </child>3446 <property name="right_attach">3</property>
3463 <child>3447 <property name="top_attach">10</property>
3464 <widget class="GtkLabel" id="label213">3448 <property name="bottom_attach">11</property>
3465 <property name="visible">True</property>3449 </packing>
3466 </widget>3450 </child>
3467 <packing>3451 <child>
3468 <property name="expand">False</property>3452 <placeholder/>
3469 <property name="fill">False</property>3453 </child>
3470 <property name="position">2</property>3454 <child>
3471 </packing>3455 <placeholder/>
3472 </child>3456 </child>
3473 <child>3457 <child>
3474 <widget class="GtkLabel" id="label170">3458 <placeholder/>
3475 <property name="visible">True</property>3459 </child>
3476 <property name="xalign">0</property>3460 <child>
3477 <property name="label" translatable="yes">B</property>3461 <placeholder/>
3478 </widget>3462 </child>
3479 <packing>3463 <child>
3480 <property name="expand">False</property>3464 <placeholder/>
3481 <property name="fill">False</property>
3482 <property name="position">3</property>
3483 </packing>
3484 </child>
3485 <child>
3486 <widget class="GtkLabel" id="label171">
3487 <property name="visible">True</property>
3488 <property name="xalign">0</property>
3489 <property name="label" translatable="yes">B</property>
3490 </widget>
3491 <packing>
3492 <property name="expand">False</property>
3493 <property name="fill">False</property>
3494 <property name="position">4</property>
3495 </packing>
3496 </child>
3497 <child>
3498 <widget class="GtkLabel" id="label210">
3499 <property name="visible">True</property>
3500 </widget>
3501 <packing>
3502 <property name="expand">False</property>
3503 <property name="fill">False</property>
3504 <property name="position">5</property>
3505 </packing>
3506 </child>
3507 </widget>
3508 <packing>
3509 <property name="position">5</property>
3510 </packing>
3511 </child>
3512 </widget>
3513 <packing>
3514 <property name="expand">False</property>
3515 </packing>
3516 </child>3465 </child>
3517 </widget>3466 </widget>
3518 <packing>3467 <packing>
@@ -3540,124 +3489,100 @@
3540 <child>3489 <child>
3541 <widget class="GtkAlignment" id="alignment4">3490 <widget class="GtkAlignment" id="alignment4">
3542 <property name="visible">True</property>3491 <property name="visible">True</property>
3543 <property name="left_padding">12</property>3492 <property name="left_padding">8</property>
3544 <child>3493 <child>
3545 <widget class="GtkTable" id="table2">3494 <widget class="GtkTable" id="table2">
3546 <property name="visible">True</property>3495 <property name="visible">True</property>
3547 <property name="n_rows">3</property>3496 <property name="n_rows">3</property>
3548 <property name="n_columns">3</property>3497 <property name="n_columns">2</property>
3549 <child>3498 <property name="column_spacing">15</property>
3550 <widget class="GtkButton" id="trustedCertificatesPathButton">3499 <property name="row_spacing">5</property>
3551 <property name="visible">True</property>3500 <child>
3552 <property name="label" translatable="yes">Browse...</property>3501 <widget class="GtkLabel" id="privateKeyLabel">
3553 <property name="response_id">0</property>3502 <property name="visible">True</property>
3554 </widget>3503 <property name="xalign">0</property>
3555 <packing>3504 <property name="label" translatable="yes">_Private key file:</property>
3556 <property name="left_attach">2</property>3505 <property name="use_underline">True</property>
3557 <property name="right_attach">3</property>3506 <property name="mnemonic_widget">privateKeyFileChooserButton</property>
3558 <property name="top_attach">2</property>3507 </widget>
3559 <property name="bottom_attach">3</property>3508 <packing>
3560 <property name="x_options"></property>3509 <property name="x_options">GTK_FILL</property>
3561 <property name="y_options"></property>3510 <property name="y_options"></property>
3562 </packing>3511 </packing>
3563 </child>3512 </child>
3564 <child>3513 <child>
3565 <widget class="GtkButton" id="certificateFileButton">3514 <widget class="GtkFileChooserButton" id="privateKeyFileChooserButton">
3566 <property name="visible">True</property>3515 <property name="visible">True</property>
3567 <property name="label" translatable="yes">Browse...</property>3516 <property name="local_only">False</property>
3568 <property name="response_id">0</property>3517 <property name="action">open</property>
3569 </widget>3518 <property name="title" translatable="yes">Select a File</property>
3570 <packing>3519 </widget>
3571 <property name="left_attach">2</property>3520 <packing>
3572 <property name="right_attach">3</property>3521 <property name="left_attach">1</property>
3573 <property name="top_attach">1</property>3522 <property name="right_attach">2</property>
3574 <property name="bottom_attach">2</property>3523 <property name="x_options">GTK_FILL|GTK_EXPAND</property>
3575 <property name="x_options"></property>3524 <property name="y_options"></property>
3576 <property name="y_options"></property>3525 </packing>
3577 </packing>3526 </child>
3578 </child>3527 <child>
3579 <child>3528 <widget class="GtkLabel" id="certificateFileLabel">
3580 <widget class="GtkButton" id="privateKeyButton">3529 <property name="visible">True</property>
3581 <property name="visible">True</property>3530 <property name="xalign">0</property>
3582 <property name="label" translatable="yes">Browse...</property>3531 <property name="label" translatable="yes">C_ertificate file:</property>
3583 <property name="response_id">0</property>3532 <property name="mnemonic_widget">certificateFileChooserButton</property>
3584 </widget>3533 <property name="use_underline">True</property>
3585 <packing>3534 </widget>
3586 <property name="left_attach">2</property>3535 <packing>
3587 <property name="right_attach">3</property>3536 <property name="top_attach">1</property>
3588 <property name="x_options"></property>3537 <property name="bottom_attach">2</property>
3589 <property name="y_options"></property>3538 <property name="x_options">GTK_FILL</property>
3590 </packing>3539 <property name="y_options"></property>
3591 </child>3540 </packing>
3592 <child>3541 </child>
3593 <widget class="GtkEntry" id="trustedCertificatesPathEntry">3542 <child>
3594 <property name="visible">True</property>3543 <widget class="GtkFileChooserButton" id="certificateFileChooserButton">
3595 </widget>3544 <property name="visible">True</property>
3596 <packing>3545 <property name="local_only">False</property>
3597 <property name="left_attach">1</property>3546 <property name="action">open</property>
3598 <property name="right_attach">2</property>3547 <property name="title" translatable="yes">Select a File</property>
3599 <property name="top_attach">2</property>3548 </widget>
3600 <property name="bottom_attach">3</property>3549 <packing>
3601 </packing>3550 <property name="left_attach">1</property>
3602 </child>3551 <property name="right_attach">2</property>
3603 <child>3552 <property name="top_attach">1</property>
3604 <widget class="GtkEntry" id="certificateFileEntry">3553 <property name="bottom_attach">2</property>
3605 <property name="visible">True</property>3554 <property name="x_options">GTK_FILL|GTK_EXPAND</property>
3606 </widget>3555 <property name="y_options"></property>
3607 <packing>
3608 <property name="left_attach">1</property>
3609 <property name="right_attach">2</property>
3610 <property name="top_attach">1</property>
3611 <property name="bottom_attach">2</property>
3612 </packing>
3613 </child>
3614 <child>
3615 <widget class="GtkEntry" id="privateKeyEntry">
3616 <property name="visible">True</property>
3617 </widget>
3618 <packing>
3619 <property name="left_attach">1</property>
3620 <property name="right_attach">2</property>
3621 </packing>3556 </packing>
3622 </child>3557 </child>
3623 <child>3558 <child>
3624 <widget class="GtkLabel" id="trustedCertificatesPathLabel">3559 <widget class="GtkLabel" id="trustedCertificatesPathLabel">
3625 <property name="visible">True</property>3560 <property name="visible">True</property>
3626 <property name="xalign">1</property>3561 <property name="xalign">0</property>
3627 <property name="label" translatable="yes">Trusted certificates path</property>3562 <property name="label" translatable="yes">_Trusted certificates path:</property>
3628 <property name="single_line_mode">True</property>3563 <property name="use_underline">True</property>
3629 </widget>3564 <property name="mnemonic_widget">trustedCertificatesPathFileChooserButton</property>
3630 <packing>3565 </widget>
3631 <property name="top_attach">2</property>3566 <packing>
3632 <property name="bottom_attach">3</property>3567 <property name="top_attach">2</property>
3633 <property name="x_options">GTK_FILL</property>3568 <property name="bottom_attach">3</property>
3634 <property name="y_options"></property>3569 <property name="x_options">GTK_FILL</property>
3635 </packing>3570 <property name="y_options"></property>
3636 </child>3571 </packing>
3637 <child>3572 </child>
3638 <widget class="GtkLabel" id="certificateFileLabel">3573 <child>
3639 <property name="visible">True</property>3574 <widget class="GtkFileChooserButton" id="trustedCertificatesPathFileChooserButton">
3640 <property name="xalign">1</property>3575 <property name="visible">True</property>
3641 <property name="label" translatable="yes">Certificate file</property>3576 <property name="local_only">False</property>
3642 <property name="single_line_mode">True</property>3577 <property name="action">select-folder</property>
3643 </widget>3578 <property name="title" translatable="yes">Select a Folder</property>
3644 <packing>3579 </widget>
3645 <property name="top_attach">1</property>3580 <packing>
3646 <property name="bottom_attach">2</property>3581 <property name="left_attach">1</property>
3647 <property name="x_options">GTK_FILL</property>3582 <property name="right_attach">2</property>
3648 <property name="y_options"></property>3583 <property name="top_attach">2</property>
3649 </packing>3584 <property name="bottom_attach">3</property>
3650 </child>3585 <property name="x_options">GTK_FILL|GTK_EXPAND</property>
3651 <child>
3652 <widget class="GtkLabel" id="privateKeyLabel">
3653 <property name="visible">True</property>
3654 <property name="xalign">1</property>
3655 <property name="label" translatable="yes">Private key file</property>
3656 <property name="justify">GTK_JUSTIFY_RIGHT</property>
3657 <property name="single_line_mode">True</property>
3658 </widget>
3659 <packing>
3660 <property name="x_options">GTK_FILL</property>
3661 <property name="y_options"></property>3586 <property name="y_options"></property>
3662 </packing>3587 </packing>
3663 </child>3588 </child>
@@ -3704,8 +3629,10 @@
3704 <child>3629 <child>
3705 <widget class="GtkLabel" id="otherOptionsLabel">3630 <widget class="GtkLabel" id="otherOptionsLabel">
3706 <property name="visible">True</property>3631 <property name="visible">True</property>
3707 <property name="label" translatable="yes">&lt;b&gt;Other Security Options&lt;/b&gt;</property>3632 <property name="label" translatable="yes">&lt;b&gt;_Security Options&lt;/b&gt;</property>
3708 <property name="use_markup">True</property>3633 <property name="use_markup">True</property>
3634 <property name="use_underline">True</property>
3635 <property name="mnemonic_widget">certificatesTreeView</property>
3709 </widget>3636 </widget>
3710 <packing>3637 <packing>
3711 <property name="type">label_item</property>3638 <property name="type">label_item</property>
@@ -3722,9 +3649,10 @@
3722 <child>3649 <child>
3723 <widget class="GtkButton" id="generateCertificatesButton">3650 <widget class="GtkButton" id="generateCertificatesButton">
3724 <property name="visible">True</property>3651 <property name="visible">True</property>
3725 <property name="label" translatable="yes">Generate certificates</property>3652 <property name="label" translatable="yes">_Generate certificates</property>
3726 <property name="xalign">1</property>3653 <property name="xalign">1</property>
3727 <property name="response_id">0</property>3654 <property name="response_id">0</property>
3655 <property name="use_underline">True</property>
3728 </widget>3656 </widget>
3729 <packing>3657 <packing>
3730 <property name="expand">False</property>3658 <property name="expand">False</property>
@@ -3749,7 +3677,7 @@
3749 <child>3677 <child>
3750 <widget class="GtkLabel" id="certificates">3678 <widget class="GtkLabel" id="certificates">
3751 <property name="visible">True</property>3679 <property name="visible">True</property>
3752 <property name="label" translatable="yes">Security Certificates</property>3680 <property name="label" translatable="yes">Security</property>
3753 </widget>3681 </widget>
3754 <packing>3682 <packing>
3755 <property name="type">tab</property>3683 <property name="type">tab</property>
@@ -3815,139 +3743,8 @@
3815 </widget>3743 </widget>
3816 </child>3744 </child>
3817 </widget>3745 </widget>
3818 <widget class="GtkDialog" id="publicHubsDialog">
3819 <property name="width_request">500</property>
3820 <property name="height_request">250</property>
3821 <property name="title" translatable="yes">Configure hub lists</property>
3822 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3823 <child internal-child="vbox">
3824 <widget class="GtkVBox" id="dialog-vbox1">
3825 <property name="visible">True</property>
3826 <child>
3827 <widget class="GtkVBox" id="vbox8">
3828 <property name="visible">True</property>
3829 <property name="border_width">8</property>
3830 <property name="spacing">4</property>
3831 <child>
3832 <widget class="GtkHBox" id="hbox5">
3833 <property name="visible">True</property>
3834 <property name="spacing">4</property>
3835 <child>
3836 <widget class="GtkTreeView" id="publicHubsDialogTreeView">
3837 <property name="visible">True</property>
3838 <property name="can_focus">True</property>
3839 </widget>
3840 </child>
3841 <child>
3842 <widget class="GtkVBox" id="vbox6">
3843 <property name="visible">True</property>
3844 <property name="spacing">4</property>
3845 <child>
3846 <widget class="GtkButton" id="publicHubsDialogAddButton">
3847 <property name="visible">True</property>
3848 <property name="can_focus">True</property>
3849 <property name="label">gtk-add</property>
3850 <property name="use_stock">True</property>
3851 <property name="response_id">0</property>
3852 </widget>
3853 <packing>
3854 <property name="expand">False</property>
3855 <property name="fill">False</property>
3856 </packing>
3857 </child>
3858 <child>
3859 <widget class="GtkButton" id="publicHubsDialogUpButton">
3860 <property name="visible">True</property>
3861 <property name="can_focus">True</property>
3862 <property name="label">gtk-go-up</property>
3863 <property name="use_stock">True</property>
3864 <property name="response_id">0</property>
3865 </widget>
3866 <packing>
3867 <property name="expand">False</property>
3868 <property name="fill">False</property>
3869 <property name="position">1</property>
3870 </packing>
3871 </child>
3872 <child>
3873 <widget class="GtkButton" id="publicHubsDialogDownButton">
3874 <property name="visible">True</property>
3875 <property name="can_focus">True</property>
3876 <property name="label">gtk-go-down</property>
3877 <property name="use_stock">True</property>
3878 <property name="response_id">0</property>
3879 </widget>
3880 <packing>
3881 <property name="expand">False</property>
3882 <property name="fill">False</property>
3883 <property name="position">2</property>
3884 </packing>
3885 </child>
3886 <child>
3887 <widget class="GtkButton" id="publicHubsDialogRemoveButton">
3888 <property name="visible">True</property>
3889 <property name="can_focus">True</property>
3890 <property name="label">gtk-remove</property>
3891 <property name="use_stock">True</property>
3892 <property name="response_id">0</property>
3893 </widget>
3894 <packing>
3895 <property name="expand">False</property>
3896 <property name="fill">False</property>
3897 <property name="position">3</property>
3898 </packing>
3899 </child>
3900 </widget>
3901 <packing>
3902 <property name="expand">False</property>
3903 <property name="position">1</property>
3904 </packing>
3905 </child>
3906 </widget>
3907 </child>
3908 <child>
3909 <widget class="GtkLabel" id="label3">
3910 <property name="visible">True</property>
3911 <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Edit urls in the list by clicking them once when selected</property>
3912 <property name="use_markup">True</property>
3913 </widget>
3914 <packing>
3915 <property name="expand">False</property>
3916 <property name="fill">False</property>
3917 <property name="position">1</property>
3918 </packing>
3919 </child>
3920 </widget>
3921 <packing>
3922 <property name="position">2</property>
3923 </packing>
3924 </child>
3925 <child internal-child="action_area">
3926 <widget class="GtkHButtonBox" id="dialog-action_area1">
3927 <property name="visible">True</property>
3928 <property name="layout_style">GTK_BUTTONBOX_END</property>
3929 <child>
3930 <widget class="GtkButton" id="okbutton1">
3931 <property name="visible">True</property>
3932 <property name="can_focus">True</property>
3933 <property name="can_default">True</property>
3934 <property name="has_default">True</property>
3935 <property name="label">gtk-ok</property>
3936 <property name="use_stock">True</property>
3937 <property name="response_id">-5</property>
3938 </widget>
3939 </child>
3940 </widget>
3941 <packing>
3942 <property name="expand">False</property>
3943 <property name="pack_type">GTK_PACK_END</property>
3944 </packing>
3945 </child>
3946 </widget>
3947 </child>
3948 </widget>
3949 <widget class="GtkDialog" id="favoriteNameDialog">3746 <widget class="GtkDialog" id="favoriteNameDialog">
3950 <property name="title" translatable="yes">Favorite name</property>3747 <property name="title" translatable="yes">Favorite Name</property>
3951 <property name="resizable">False</property>3748 <property name="resizable">False</property>
3952 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>3749 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3953 <child internal-child="vbox">3750 <child internal-child="vbox">
@@ -3978,8 +3775,9 @@
3978 <child>3775 <child>
3979 <widget class="GtkLabel" id="label63">3776 <widget class="GtkLabel" id="label63">
3980 <property name="visible">True</property>3777 <property name="visible">True</property>
3981 <property name="label" translatable="yes">&lt;b&gt;Under what name you see the directory&lt;/b&gt;</property>3778 <property name="label" translatable="yes">_Alias for the favorite download directory:</property>
3982 <property name="use_markup">True</property>3779 <property name="use_underline">True</property>
3780 <property name="mnemonic_widget">favoriteNameDialogEntry</property>
3983 </widget>3781 </widget>
3984 <packing>3782 <packing>
3985 <property name="type">label_item</property>3783 <property name="type">label_item</property>
@@ -4029,7 +3827,7 @@
4029 </child>3827 </child>
4030 </widget>3828 </widget>
4031 <widget class="GtkDialog" id="virtualNameDialog">3829 <widget class="GtkDialog" id="virtualNameDialog">
4032 <property name="title" translatable="yes">Virtual name</property>3830 <property name="title" translatable="yes">Virtual Name</property>
4033 <property name="resizable">False</property>3831 <property name="resizable">False</property>
4034 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>3832 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4035 <child internal-child="vbox">3833 <child internal-child="vbox">
@@ -4044,6 +3842,7 @@
4044 <widget class="GtkVBox" id="vbox26">3842 <widget class="GtkVBox" id="vbox26">
4045 <property name="visible">True</property>3843 <property name="visible">True</property>
4046 <property name="border_width">8</property>3844 <property name="border_width">8</property>
3845 <property name="spacing">10</property>
4047 <child>3846 <child>
4048 <widget class="GtkEntry" id="virtualNameDialogEntry">3847 <widget class="GtkEntry" id="virtualNameDialogEntry">
4049 <property name="visible">True</property>3848 <property name="visible">True</property>
@@ -4055,14 +3854,27 @@
4055 <property name="fill">False</property>3854 <property name="fill">False</property>
4056 </packing>3855 </packing>
4057 </child>3856 </child>
3857 <child>
3858 <widget class="GtkLabel" id="label34">
3859 <property name="visible">True</property>
3860 <property name="xalign">0</property>
3861 <property name="label" translatable="yes">Note: New files are added to the share only once they've been hashed</property>
3862 </widget>
3863 <packing>
3864 <property name="expand">False</property>
3865 <property name="fill">False</property>
3866 <property name="position">1</property>
3867 </packing>
3868 </child>
4058 </widget>3869 </widget>
4059 </child>3870 </child>
4060 <child>3871 <child>
4061 <widget class="GtkLabel" id="label65">3872 <widget class="GtkLabel" id="label65">
4062 <property name="visible">True</property>3873 <property name="visible">True</property>
4063 <property name="xalign">0</property>3874 <property name="xalign">0</property>
4064 <property name="label" translatable="yes">&lt;b&gt;Name under which the others see the directory&lt;/b&gt;</property>3875 <property name="label" translatable="yes">_Alias for the shared directory:</property>
4065 <property name="use_markup">True</property>3876 <property name="use_underline">True</property>
3877 <property name="mnemonic_widget">virtualNameDialogEntry</property>
4066 </widget>3878 </widget>
4067 <packing>3879 <packing>
4068 <property name="type">label_item</property>3880 <property name="type">label_item</property>
@@ -4111,7 +3923,7 @@
4111 </child>3923 </child>
4112 </widget>3924 </widget>
4113 <widget class="GtkFileChooserDialog" id="dirChooserDialog">3925 <widget class="GtkFileChooserDialog" id="dirChooserDialog">
4114 <property name="title" translatable="yes">Choose a directory</property>3926 <property name="title" translatable="yes">Select a Folder</property>
4115 <property name="modal">True</property>3927 <property name="modal">True</property>
4116 <property name="local_only">False</property>3928 <property name="local_only">False</property>
4117 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>3929 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -4161,59 +3973,9 @@
4161 </widget>3973 </widget>
4162 </child>3974 </child>
4163 </widget>3975 </widget>
4164 <widget class="GtkFileChooserDialog" id="fileChooserDialog">
4165 <property name="border_width">5</property>
4166 <property name="title" translatable="yes">Choose a File</property>
4167 <property name="modal">True</property>
4168 <property name="local_only">False</property>
4169 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4170 <property name="has_separator">False</property>
4171 <child internal-child="vbox">
4172 <widget class="GtkVBox" id="dialog-vbox9">
4173 <property name="visible">True</property>
4174 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
4175 <property name="spacing">2</property>
4176 <child>
4177 <placeholder/>
4178 </child>
4179 <child internal-child="action_area">
4180 <widget class="GtkHButtonBox" id="dialog-action_area9">
4181 <property name="visible">True</property>
4182 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
4183 <property name="layout_style">GTK_BUTTONBOX_END</property>
4184 <child>
4185 <widget class="GtkButton" id="button4">
4186 <property name="visible">True</property>
4187 <property name="label" translatable="yes">gtk-cancel</property>
4188 <property name="use_stock">True</property>
4189 <property name="response_id">-6</property>
4190 </widget>
4191 </child>
4192 <child>
4193 <widget class="GtkButton" id="button3">
4194 <property name="visible">True</property>
4195 <property name="can_default">True</property>
4196 <property name="has_default">True</property>
4197 <property name="label" translatable="yes">gtk-open</property>
4198 <property name="use_stock">True</property>
4199 <property name="response_id">-5</property>
4200 </widget>
4201 <packing>
4202 <property name="position">1</property>
4203 </packing>
4204 </child>
4205 </widget>
4206 <packing>
4207 <property name="expand">False</property>
4208 <property name="pack_type">GTK_PACK_END</property>
4209 </packing>
4210 </child>
4211 </widget>
4212 </child>
4213 </widget>
4214 <widget class="GtkDialog" id="commandDialog">3976 <widget class="GtkDialog" id="commandDialog">
4215 <property name="title" translatable="yes">Modify User Command</property>3977 <property name="title" translatable="yes">Edit User Command</property>
4216 <property name="resizable">False</property>3978 <property name="default_width">500</property>
4217 <property name="modal">True</property>3979 <property name="modal">True</property>
4218 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>3980 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4219 <child internal-child="vbox">3981 <child internal-child="vbox">
@@ -4238,7 +4000,7 @@
4238 <widget class="GtkRadioButton" id="commandDialogRaw">4000 <widget class="GtkRadioButton" id="commandDialogRaw">
4239 <property name="visible">True</property>4001 <property name="visible">True</property>
4240 <property name="can_focus">True</property>4002 <property name="can_focus">True</property>
4241 <property name="label" translatable="yes">Raw</property>4003 <property name="label" translatable="yes">_Raw</property>
4242 <property name="use_underline">True</property>4004 <property name="use_underline">True</property>
4243 <property name="response_id">0</property>4005 <property name="response_id">0</property>
4244 <property name="draw_indicator">True</property>4006 <property name="draw_indicator">True</property>
@@ -4254,7 +4016,7 @@
4254 <widget class="GtkRadioButton" id="commandDialogPM">4016 <widget class="GtkRadioButton" id="commandDialogPM">
4255 <property name="visible">True</property>4017 <property name="visible">True</property>
4256 <property name="can_focus">True</property>4018 <property name="can_focus">True</property>
4257 <property name="label" translatable="yes">PM</property>4019 <property name="label" translatable="yes">_Private Message</property>
4258 <property name="use_underline">True</property>4020 <property name="use_underline">True</property>
4259 <property name="response_id">0</property>4021 <property name="response_id">0</property>
4260 <property name="draw_indicator">True</property>4022 <property name="draw_indicator">True</property>
@@ -4272,7 +4034,7 @@
4272 <widget class="GtkRadioButton" id="commandDialogChat">4034 <widget class="GtkRadioButton" id="commandDialogChat">
4273 <property name="visible">True</property>4035 <property name="visible">True</property>
4274 <property name="can_focus">True</property>4036 <property name="can_focus">True</property>
4275 <property name="label" translatable="yes">Chat</property>4037 <property name="label" translatable="yes">Ch_at</property>
4276 <property name="use_underline">True</property>4038 <property name="use_underline">True</property>
4277 <property name="response_id">0</property>4039 <property name="response_id">0</property>
4278 <property name="draw_indicator">True</property>4040 <property name="draw_indicator">True</property>
@@ -4288,7 +4050,7 @@
4288 <widget class="GtkRadioButton" id="commandDialogSeparator">4050 <widget class="GtkRadioButton" id="commandDialogSeparator">
4289 <property name="visible">True</property>4051 <property name="visible">True</property>
4290 <property name="can_focus">True</property>4052 <property name="can_focus">True</property>
4291 <property name="label" translatable="yes">Separator</property>4053 <property name="label" translatable="yes">_Separator</property>
4292 <property name="use_underline">True</property>4054 <property name="use_underline">True</property>
4293 <property name="response_id">0</property>4055 <property name="response_id">0</property>
4294 <property name="draw_indicator">True</property>4056 <property name="draw_indicator">True</property>
@@ -4325,7 +4087,7 @@
4325 <widget class="GtkCheckButton" id="commandDialogSearchMenu">4087 <widget class="GtkCheckButton" id="commandDialogSearchMenu">
4326 <property name="visible">True</property>4088 <property name="visible">True</property>
4327 <property name="can_focus">True</property>4089 <property name="can_focus">True</property>
4328 <property name="label" translatable="yes">Search Menu</property>4090 <property name="label" translatable="yes">S_earch</property>
4329 <property name="use_underline">True</property>4091 <property name="use_underline">True</property>
4330 <property name="response_id">0</property>4092 <property name="response_id">0</property>
4331 <property name="draw_indicator">True</property>4093 <property name="draw_indicator">True</property>
@@ -4340,7 +4102,7 @@
4340 <widget class="GtkCheckButton" id="commandDialogUserMenu">4102 <widget class="GtkCheckButton" id="commandDialogUserMenu">
4341 <property name="visible">True</property>4103 <property name="visible">True</property>
4342 <property name="can_focus">True</property>4104 <property name="can_focus">True</property>
4343 <property name="label" translatable="yes">Chat Menu</property>4105 <property name="label" translatable="yes">Ch_at</property>
4344 <property name="use_underline">True</property>4106 <property name="use_underline">True</property>
4345 <property name="response_id">0</property>4107 <property name="response_id">0</property>
4346 <property name="draw_indicator">True</property>4108 <property name="draw_indicator">True</property>
@@ -4355,7 +4117,7 @@
4355 <widget class="GtkCheckButton" id="commandDialogFilelistMenu">4117 <widget class="GtkCheckButton" id="commandDialogFilelistMenu">
4356 <property name="visible">True</property>4118 <property name="visible">True</property>
4357 <property name="can_focus">True</property>4119 <property name="can_focus">True</property>
4358 <property name="label" translatable="yes">Filelist Menu</property>4120 <property name="label" translatable="yes">_File list</property>
4359 <property name="use_underline">True</property>4121 <property name="use_underline">True</property>
4360 <property name="response_id">0</property>4122 <property name="response_id">0</property>
4361 <property name="draw_indicator">True</property>4123 <property name="draw_indicator">True</property>
@@ -4372,7 +4134,7 @@
4372 <widget class="GtkCheckButton" id="commandDialogHubMenu">4134 <widget class="GtkCheckButton" id="commandDialogHubMenu">
4373 <property name="visible">True</property>4135 <property name="visible">True</property>
4374 <property name="can_focus">True</property>4136 <property name="can_focus">True</property>
4375 <property name="label" translatable="yes">Hub Menu</property>4137 <property name="label" translatable="yes">_Hub</property>
4376 <property name="use_underline">True</property>4138 <property name="use_underline">True</property>
4377 <property name="response_id">0</property>4139 <property name="response_id">0</property>
4378 <property name="draw_indicator">True</property>4140 <property name="draw_indicator">True</property>
@@ -4386,7 +4148,7 @@
4386 <child>4148 <child>
4387 <widget class="GtkLabel" id="label68">4149 <widget class="GtkLabel" id="label68">
4388 <property name="visible">True</property>4150 <property name="visible">True</property>
4389 <property name="label" translatable="yes">&lt;b&gt;Context&lt;/b&gt;</property>4151 <property name="label" translatable="yes">&lt;b&gt;Menu Context&lt;/b&gt;</property>
4390 <property name="use_markup">True</property>4152 <property name="use_markup">True</property>
4391 </widget>4153 </widget>
4392 <packing>4154 <packing>
@@ -4414,7 +4176,9 @@
4414 <widget class="GtkLabel" id="label70">4176 <widget class="GtkLabel" id="label70">
4415 <property name="visible">True</property>4177 <property name="visible">True</property>
4416 <property name="xalign">0</property>4178 <property name="xalign">0</property>
4417 <property name="label" translatable="yes">Name</property>4179 <property name="label" translatable="yes">_Name:</property>
4180 <property name="use_underline">True</property>
4181 <property name="mnemonic_widget">commandDialogName</property>
4418 </widget>4182 </widget>
4419 <packing>4183 <packing>
4420 <property name="expand">False</property>4184 <property name="expand">False</property>
@@ -4442,7 +4206,9 @@
4442 <widget class="GtkLabel" id="label71">4206 <widget class="GtkLabel" id="label71">
4443 <property name="visible">True</property>4207 <property name="visible">True</property>
4444 <property name="xalign">0</property>4208 <property name="xalign">0</property>
4445 <property name="label" translatable="yes">Command</property>4209 <property name="label" translatable="yes">Co_mmand:</property>
4210 <property name="use_underline">True</property>
4211 <property name="mnemonic_widget">commandDialogCommand</property>
4446 </widget>4212 </widget>
4447 <packing>4213 <packing>
4448 <property name="expand">False</property>4214 <property name="expand">False</property>
@@ -4473,7 +4239,9 @@
4473 <widget class="GtkLabel" id="label72">4239 <widget class="GtkLabel" id="label72">
4474 <property name="visible">True</property>4240 <property name="visible">True</property>
4475 <property name="xalign">0</property>4241 <property name="xalign">0</property>
4476 <property name="label" translatable="yes">Hub IP / DNS (empty = All, 'op' = where operator)</property>4242 <property name="label" translatable="yes">_Hub address:</property>
4243 <property name="use_underline">True</property>
4244 <property name="mnemonic_widget">commandDialogHub</property>
4477 </widget>4245 </widget>
4478 <packing>4246 <packing>
4479 <property name="expand">False</property>4247 <property name="expand">False</property>
@@ -4485,6 +4253,7 @@
4485 <property name="visible">True</property>4253 <property name="visible">True</property>
4486 <property name="can_focus">True</property>4254 <property name="can_focus">True</property>
4487 <property name="activates_default">True</property>4255 <property name="activates_default">True</property>
4256 <property name="tooltip_text" translatable="yes">A value of 'op' indicates only hubs in which the user is an operator. Leave empty for all hubs.</property>
4488 </widget>4257 </widget>
4489 <packing>4258 <packing>
4490 <property name="expand">False</property>4259 <property name="expand">False</property>
@@ -4504,7 +4273,9 @@
4504 <widget class="GtkLabel" id="label73">4273 <widget class="GtkLabel" id="label73">
4505 <property name="visible">True</property>4274 <property name="visible">True</property>
4506 <property name="xalign">0</property>4275 <property name="xalign">0</property>
4507 <property name="label" translatable="yes">To (empty for selected user)</property>4276 <property name="label" translatable="yes">_Username:</property>
4277 <property name="use_underline">True</property>
4278 <property name="mnemonic_widget">commandDialogTo</property>
4508 </widget>4279 </widget>
4509 <packing>4280 <packing>
4510 <property name="expand">False</property>4281 <property name="expand">False</property>
@@ -4516,6 +4287,7 @@
4516 <property name="visible">True</property>4287 <property name="visible">True</property>
4517 <property name="can_focus">True</property>4288 <property name="can_focus">True</property>
4518 <property name="activates_default">True</property>4289 <property name="activates_default">True</property>
4290 <property name="tooltip_text">Leave empty for selected user</property>
4519 </widget>4291 </widget>
4520 <packing>4292 <packing>
4521 <property name="expand">False</property>4293 <property name="expand">False</property>
@@ -4532,7 +4304,7 @@
4532 <widget class="GtkCheckButton" id="commandDialogOnce">4304 <widget class="GtkCheckButton" id="commandDialogOnce">
4533 <property name="visible">True</property>4305 <property name="visible">True</property>
4534 <property name="can_focus">True</property>4306 <property name="can_focus">True</property>
4535 <property name="label" translatable="yes">Send once per user</property>4307 <property name="label" translatable="yes">Sen_d once per user</property>
4536 <property name="use_underline">True</property>4308 <property name="use_underline">True</property>
4537 <property name="response_id">0</property>4309 <property name="response_id">0</property>
4538 <property name="draw_indicator">True</property>4310 <property name="draw_indicator">True</property>
@@ -4584,7 +4356,7 @@
4584 <child>4356 <child>
4585 <widget class="GtkLabel" id="label74">4357 <widget class="GtkLabel" id="label74">
4586 <property name="visible">True</property>4358 <property name="visible">True</property>
4587 <property name="label" translatable="yes">&lt;b&gt;Text sent to hub&lt;/b&gt;</property>4359 <property name="label" translatable="yes">&lt;b&gt;Raw Command&lt;/b&gt;</property>
4588 <property name="use_markup">True</property>4360 <property name="use_markup">True</property>
4589 </widget>4361 </widget>
4590 <packing>4362 <packing>
45914363
=== modified file 'glade/sharebrowser.glade'
--- glade/sharebrowser.glade 2009-06-17 03:28:37 +0000
+++ glade/sharebrowser.glade 2011-01-25 05:38:26 +0000
@@ -80,7 +80,7 @@
80 </child>80 </child>
81 <child>81 <child>
82 <widget class="GtkStatusbar" id="filesStatus">82 <widget class="GtkStatusbar" id="filesStatus">
83 <property name="width_request">120</property>83 <property name="width_request">130</property>
84 <property name="visible">True</property>84 <property name="visible">True</property>
85 <property name="has_resize_grip">False</property>85 <property name="has_resize_grip">False</property>
86 </widget>86 </widget>
@@ -92,7 +92,7 @@
92 </child>92 </child>
93 <child>93 <child>
94 <widget class="GtkStatusbar" id="totalStatus">94 <widget class="GtkStatusbar" id="totalStatus">
95 <property name="width_request">120</property>95 <property name="width_request">150</property>
96 <property name="visible">True</property>96 <property name="visible">True</property>
97 <property name="has_resize_grip">False</property>97 <property name="has_resize_grip">False</property>
98 </widget>98 </widget>
@@ -151,7 +151,7 @@
151 <widget class="GtkDialog" id="findDialog">151 <widget class="GtkDialog" id="findDialog">
152 <property name="width_request">275</property>152 <property name="width_request">275</property>
153 <property name="height_request">125</property>153 <property name="height_request">125</property>
154 <property name="title" translatable="yes">Find files</property>154 <property name="title" translatable="yes">Find Files</property>
155 <property name="modal">True</property>155 <property name="modal">True</property>
156 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>156 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
157 <child internal-child="vbox">157 <child internal-child="vbox">
@@ -179,8 +179,9 @@
179 <child>179 <child>
180 <widget class="GtkLabel" id="label1">180 <widget class="GtkLabel" id="label1">
181 <property name="visible">True</property>181 <property name="visible">True</property>
182 <property name="label" translatable="yes">Enter text to search for</property>182 <property name="label" translatable="yes">_Search text:</property>
183 <property name="use_markup">True</property>183 <property name="use_underline">True</property>
184 <property name="mnemonic_widget">findEntry</property>
184 </widget>185 </widget>
185 <packing>186 <packing>
186 <property name="type">label_item</property>187 <property name="type">label_item</property>
@@ -232,14 +233,14 @@
232 <child>233 <child>
233 <widget class="GtkMenuItem" id="dirDownloadItem">234 <widget class="GtkMenuItem" id="dirDownloadItem">
234 <property name="visible">True</property>235 <property name="visible">True</property>
235 <property name="label" translatable="yes">Download</property>236 <property name="label" translatable="yes">_Download</property>
236 <property name="use_underline">True</property>237 <property name="use_underline">True</property>
237 </widget>238 </widget>
238 </child>239 </child>
239 <child>240 <child>
240 <widget class="GtkMenuItem" id="dirDownloadToItem">241 <widget class="GtkMenuItem" id="dirDownloadToItem">
241 <property name="visible">True</property>242 <property name="visible">True</property>
242 <property name="label" translatable="yes">Download to...</property>243 <property name="label" translatable="yes">Download _to</property>
243 <property name="use_underline">True</property>244 <property name="use_underline">True</property>
244 <child>245 <child>
245 <widget class="GtkMenu" id="dirDownloadMenu">246 <widget class="GtkMenu" id="dirDownloadMenu">
@@ -255,7 +256,7 @@
255 <child>256 <child>
256 <widget class="GtkMenuItem" id="dirUserCommandItem">257 <widget class="GtkMenuItem" id="dirUserCommandItem">
257 <property name="visible">True</property>258 <property name="visible">True</property>
258 <property name="label" translatable="yes">User commands</property>259 <property name="label" translatable="yes">_User commands</property>
259 <property name="use_underline">True</property>260 <property name="use_underline">True</property>
260 <child>261 <child>
261 <widget class="GtkMenu" id="dirUserCommandMenu">262 <widget class="GtkMenu" id="dirUserCommandMenu">
@@ -268,14 +269,14 @@
268 <child>269 <child>
269 <widget class="GtkMenuItem" id="fileDownloadItem">270 <widget class="GtkMenuItem" id="fileDownloadItem">
270 <property name="visible">True</property>271 <property name="visible">True</property>
271 <property name="label" translatable="yes">Download</property>272 <property name="label" translatable="yes">_Download</property>
272 <property name="use_underline">True</property>273 <property name="use_underline">True</property>
273 </widget>274 </widget>
274 </child>275 </child>
275 <child>276 <child>
276 <widget class="GtkMenuItem" id="fileDownloadToItem">277 <widget class="GtkMenuItem" id="fileDownloadToItem">
277 <property name="visible">True</property>278 <property name="visible">True</property>
278 <property name="label" translatable="yes">Download to...</property>279 <property name="label" translatable="yes">Download _to</property>
279 <property name="use_underline">True</property>280 <property name="use_underline">True</property>
280 <child>281 <child>
281 <widget class="GtkMenu" id="fileDownloadMenu">282 <widget class="GtkMenu" id="fileDownloadMenu">
@@ -305,7 +306,7 @@
305 <child>306 <child>
306 <widget class="GtkMenuItem" id="fileUserCommandItem">307 <widget class="GtkMenuItem" id="fileUserCommandItem">
307 <property name="visible">True</property>308 <property name="visible">True</property>
308 <property name="label" translatable="yes">User commands</property>309 <property name="label" translatable="yes">_User commands</property>
309 <property name="use_underline">True</property>310 <property name="use_underline">True</property>
310 <child>311 <child>
311 <widget class="GtkMenu" id="fileUserCommandMenu">312 <widget class="GtkMenu" id="fileUserCommandMenu">
312313
=== modified file 'glade/transfers.glade'
--- glade/transfers.glade 2009-03-18 00:50:57 +0000
+++ glade/transfers.glade 2011-01-25 05:38:26 +0000
@@ -70,7 +70,7 @@
70 <child>70 <child>
71 <widget class="GtkMenuItem" id="userCommandItem">71 <widget class="GtkMenuItem" id="userCommandItem">
72 <property name="visible">True</property>72 <property name="visible">True</property>
73 <property name="label" translatable="yes">User commands</property>73 <property name="label" translatable="yes">_User commands</property>
74 <property name="use_underline">True</property>74 <property name="use_underline">True</property>
75 <child>75 <child>
76 <widget class="GtkMenu" id="userCommandMenu">76 <widget class="GtkMenu" id="userCommandMenu">
7777
=== added file 'linux/IntlUtil.hh'
--- linux/IntlUtil.hh 1970-01-01 00:00:00 +0000
+++ linux/IntlUtil.hh 2011-01-25 05:38:26 +0000
@@ -0,0 +1,64 @@
1/*
2 * Copyright © 2010 Jens Oknelid, paskharen@gmail.com
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17 *
18 * In addition, as a special exception, compiling, linking, and/or
19 * using OpenSSL with this program is allowed.
20 */
21
22#ifndef LINUXDCPP_INTL_UTIL_HH
23#define LINUXDCPP_INTL_UTIL_HH
24
25#include <boost/format.hpp>
26#include <string>
27#include <exception>
28#include <glib/gi18n.h>
29#include <errno.h>
30
31class IntlUtil
32{
33 public:
34 // Initialize i18n support
35 static void initialize()
36 {
37 if (bindtextdomain(PACKAGE, _DATADIR "/locale") == NULL)
38 throw std::runtime_error(strerror(errno));
39
40 if (textdomain(PACKAGE) == NULL)
41 throw std::runtime_error(strerror(errno));
42
43 if (bind_textdomain_codeset(PACKAGE, "UTF-8") == NULL)
44 throw std::runtime_error(strerror(errno));
45 }
46
47 static inline boost::format message_format(const char *text)
48 {
49 boost::format fmt(text);
50 fmt.exceptions(boost::io::no_error_bits);
51 return fmt;
52 }
53
54 static inline boost::format message_format(const std::string &text)
55 {
56 return message_format(text.c_str());
57 }
58};
59
60#define F_(text, params) (IntlUtil::message_format(_(text)) params).str()
61#define P_(text, text_plural, params, n) (IntlUtil::message_format(g_dngettext(NULL, text, text_plural, n)) params).str()
62
63#endif /* LINUXDCPP_INTL_UTIL_HH */
64
065
=== modified file 'linux/SConscript'
--- linux/SConscript 2010-10-12 04:50:18 +0000
+++ linux/SConscript 2011-01-25 05:38:26 +0000
@@ -4,18 +4,19 @@
44
5VERSION_SOURCE = 'version.cc'5VERSION_SOURCE = 'version.cc'
66
7# We don't want to add these CFLAGS globally so we copy the env7header_files = env.Glob('*.hh')
8env = env.Clone()
9env.ParseConfig('pkg-config --cflags libglade-2.0')
10
11gui_files = env.Glob('*.cc')8gui_files = env.Glob('*.cc')
12gui_files.remove(File(VERSION_SOURCE))9gui_files.remove(File(VERSION_SOURCE))
13obj_files = []10obj_files = []
1411
12env.ParseConfig('pkg-config --cflags libglade-2.0')
13env.Append(CPPDEFINES='PACKAGE=\'\"%s\"\'' % env['package'])
14
15# Build the gui_files15# Build the gui_files
16obj_files = env.Object(gui_files)16obj_files = env.Object(gui_files)
17obj_file = env.Object(VERSION_SOURCE, CPPDEFINES = 'BZR_REVISION=\\"%s\\"' % env['BZR_REVISION'])17obj_file = env.Object(VERSION_SOURCE, CPPDEFINES = 'BZR_REVISION=\\"%s\\"' % env['BZR_REVISION'])
18
19obj_files.append(obj_file)18obj_files.append(obj_file)
2019
21Return('obj_files')20pot_file = env.PotBuild(source=gui_files + header_files, target='po/linux.pot', LANGUAGE='C++')
21
22Return('pot_file', 'obj_files')
2223
=== modified file 'linux/WulforUtil.cc'
--- linux/WulforUtil.cc 2010-05-22 14:23:56 +0000
+++ linux/WulforUtil.cc 2011-01-25 05:38:26 +0000
@@ -20,7 +20,7 @@
20 */20 */
2121
22#include "WulforUtil.hh"22#include "WulforUtil.hh"
23#include <glib/gi18n.h>23#include "IntlUtil.hh"
24#include <glib/gstdio.h>24#include <glib/gstdio.h>
25#include <glib.h>25#include <glib.h>
26#include <dcpp/ClientManager.h>26#include <dcpp/ClientManager.h>
@@ -38,7 +38,7 @@
38using namespace std;38using namespace std;
39using namespace dcpp;39using namespace dcpp;
4040
41const string WulforUtil::ENCODING_LOCALE = _("System default");41const string WulforUtil::ENCODING_LOCALE = C_("Character encoding", "System default");
42std::vector<std::string> WulforUtil::charsets;42std::vector<std::string> WulforUtil::charsets;
43const std::string WulforUtil::magnetSignature = "magnet:?xt=urn:tree:tiger:";43const std::string WulforUtil::magnetSignature = "magnet:?xt=urn:tree:tiger:";
44GtkIconFactory* WulforUtil::iconFactory = NULL;44GtkIconFactory* WulforUtil::iconFactory = NULL;
@@ -154,7 +154,7 @@
154{154{
155 StringList hubs = ClientManager::getInstance()->getHubNames(cid);155 StringList hubs = ClientManager::getInstance()->getHubNames(cid);
156 if (hubs.empty())156 if (hubs.empty())
157 return _("Offline");157 return C_("User", "Offline");
158 else158 else
159 return Util::toString(hubs);159 return Util::toString(hubs);
160}160}
@@ -190,22 +190,22 @@
190 if (charsets.size() == 0)190 if (charsets.size() == 0)
191 {191 {
192 charsets.push_back(ENCODING_LOCALE);192 charsets.push_back(ENCODING_LOCALE);
193 charsets.push_back(_("UTF-8 (Unicode)"));193 charsets.push_back(C_("Character encoding", "UTF-8 (Unicode)"));
194 charsets.push_back(_("CP1252 (Western Europe)"));194 charsets.push_back(C_("Character encoding", "CP1252 (Western Europe)"));
195 charsets.push_back(_("CP1250 (Central Europe)"));195 charsets.push_back(C_("Character encoding", "CP1250 (Central Europe)"));
196 charsets.push_back(_("ISO-8859-2 (Central Europe)"));196 charsets.push_back(C_("Character encoding", "ISO-8859-2 (Central Europe)"));
197 charsets.push_back(_("ISO-8859-7 (Greek)"));197 charsets.push_back(C_("Character encoding", "ISO-8859-7 (Greek)"));
198 charsets.push_back(_("ISO-8859-8 (Hebrew)"));198 charsets.push_back(C_("Character encoding", "ISO-8859-8 (Hebrew)"));
199 charsets.push_back(_("ISO-8859-9 (Turkish)"));199 charsets.push_back(C_("Character encoding", "ISO-8859-9 (Turkish)"));
200 charsets.push_back(_("ISO-2022-JP (Japanese)"));200 charsets.push_back(C_("Character encoding", "ISO-2022-JP (Japanese)"));
201 charsets.push_back(_("SJIS (Japanese)"));201 charsets.push_back(C_("Character encoding", "SJIS (Japanese)"));
202 charsets.push_back(_("CP949 (Korean)"));202 charsets.push_back(C_("Character encoding", "CP949 (Korean)"));
203 charsets.push_back(_("KOI8-R (Cyrillic)"));203 charsets.push_back(C_("Character encoding", "KOI8-R (Cyrillic)"));
204 charsets.push_back(_("CP1251 (Cyrillic)"));204 charsets.push_back(C_("Character encoding", "CP1251 (Cyrillic)"));
205 charsets.push_back(_("CP1256 (Arabic)"));205 charsets.push_back(C_("Character encoding", "CP1256 (Arabic)"));
206 charsets.push_back(_("CP1257 (Baltic)"));206 charsets.push_back(C_("Character encoding", "CP1257 (Baltic)"));
207 charsets.push_back(_("GB18030 (Chinese)"));207 charsets.push_back(C_("Character encoding", "GB18030 (Chinese)"));
208 charsets.push_back(_("TIS-620 (Thai)"));208 charsets.push_back(C_("Character encoding", "TIS-620 (Thai)"));
209 }209 }
210 return charsets;210 return charsets;
211}211}
@@ -248,9 +248,9 @@
248248
249bool WulforUtil::splitMagnet(const string &magnet, string &name, int64_t &size, string &tth)249bool WulforUtil::splitMagnet(const string &magnet, string &name, int64_t &size, string &tth)
250{250{
251 name = _("Unknown");251 name = C_("Magnet", "Unknown");
252 size = 0;252 size = 0;
253 tth = _("Unknown");253 tth = C_("Magnet", "Unknown");
254254
255 if (!isMagnet(magnet.c_str()) || magnet.size() <= magnetSignature.length())255 if (!isMagnet(magnet.c_str()) || magnet.size() <= magnetSignature.length())
256 return FALSE;256 return FALSE;
257257
=== modified file 'linux/bookentry.cc'
--- linux/bookentry.cc 2011-01-07 16:04:03 +0000
+++ linux/bookentry.cc 2011-01-25 05:38:26 +0000
@@ -101,6 +101,7 @@
101 if (len > labelSize)101 if (len > labelSize)
102 {102 {
103 gchar truncatedText[text.size()];103 gchar truncatedText[text.size()];
104 // TRANSLATORS: Tab label ellipsis to indicate text is longer than tab width
104 const string clipText = _("...");105 const string clipText = _("...");
105 len = labelSize - g_utf8_strlen(clipText.c_str(), -1);106 len = labelSize - g_utf8_strlen(clipText.c_str(), -1);
106 g_utf8_strncpy(truncatedText, text.c_str(), len);107 g_utf8_strncpy(truncatedText, text.c_str(), len);
107108
=== modified file 'linux/downloadqueue.cc'
--- linux/downloadqueue.cc 2009-08-15 04:40:26 +0000
+++ linux/downloadqueue.cc 2011-01-25 05:38:26 +0000
@@ -57,17 +57,17 @@
5757
58 // Initialize file treeview58 // Initialize file treeview
59 fileView.setView(GTK_TREE_VIEW(getWidget("fileView")), TRUE, "downloadqueue");59 fileView.setView(GTK_TREE_VIEW(getWidget("fileView")), TRUE, "downloadqueue");
60 fileView.insertColumn("Filename", G_TYPE_STRING, TreeView::STRING, 200);60 fileView.insertColumn(N_("Filename"), G_TYPE_STRING, TreeView::STRING, 200);
61 fileView.insertColumn("Status", G_TYPE_STRING, TreeView::STRING, 100);61 fileView.insertColumn(N_("Status"), G_TYPE_STRING, TreeView::STRING, 100);
62 fileView.insertColumn("Size", G_TYPE_STRING, TreeView::STRING, 100);62 fileView.insertColumn(N_("Size"), G_TYPE_STRING, TreeView::STRING, 100);
63 fileView.insertColumn("Downloaded", G_TYPE_STRING, TreeView::STRING, 150);63 fileView.insertColumn(N_("Downloaded"), G_TYPE_STRING, TreeView::STRING, 150);
64 fileView.insertColumn("Priority", G_TYPE_STRING, TreeView::STRING, 75);64 fileView.insertColumn(N_("Priority"), G_TYPE_STRING, TreeView::STRING, 75);
65 fileView.insertColumn("Users", G_TYPE_STRING, TreeView::STRING, 200);65 fileView.insertColumn(N_("Users"), G_TYPE_STRING, TreeView::STRING, 200);
66 fileView.insertColumn("Path", G_TYPE_STRING, TreeView::STRING, 200);66 fileView.insertColumn(N_("Path"), G_TYPE_STRING, TreeView::STRING, 200);
67 fileView.insertColumn("Exact Size", G_TYPE_STRING, TreeView::STRING, 100);67 fileView.insertColumn(N_("Exact Size"), G_TYPE_STRING, TreeView::STRING, 100);
68 fileView.insertColumn("Errors", G_TYPE_STRING, TreeView::STRING, 200);68 fileView.insertColumn(N_("Errors"), G_TYPE_STRING, TreeView::STRING, 200);
69 fileView.insertColumn("Added", G_TYPE_STRING, TreeView::STRING, 120);69 fileView.insertColumn(N_("Added"), G_TYPE_STRING, TreeView::STRING, 120);
70 fileView.insertColumn("TTH", G_TYPE_STRING, TreeView::STRING, 125);70 fileView.insertColumn(N_("TTH"), G_TYPE_STRING, TreeView::STRING, 125);
71 fileView.insertHiddenColumn("Size Sort", G_TYPE_INT64);71 fileView.insertHiddenColumn("Size Sort", G_TYPE_INT64);
72 fileView.insertHiddenColumn("Downloaded Sort", G_TYPE_INT64);72 fileView.insertHiddenColumn("Downloaded Sort", G_TYPE_INT64);
73 fileView.insertHiddenColumn("Target", G_TYPE_STRING);73 fileView.insertHiddenColumn("Target", G_TYPE_STRING);
@@ -225,10 +225,10 @@
225225
226void DownloadQueue::updateStatus_gui()226void DownloadQueue::updateStatus_gui()
227{227{
228 setStatus_gui(_("Items: ") + Util::toString(currentItems), "statusItems");228 setStatus_gui(F_("Items: %1%", % currentItems), "statusItems");
229 setStatus_gui(_("Size: ") + Util::formatBytes(currentSize), "statusFileSize");229 setStatus_gui(F_("Size: %1%", % Util::formatBytes(currentSize)), "statusFileSize");
230 setStatus_gui(_("Files: ") + Util::toString(totalItems), "statusFiles");230 setStatus_gui(F_("Files: %1%", % totalItems), "statusFiles");
231 setStatus_gui(_("Size: ") + Util::formatBytes(totalSize), "statusTotalSize");231 setStatus_gui(F_("Size: %1%", % Util::formatBytes(totalSize)), "statusTotalSize");
232}232}
233233
234void DownloadQueue::addFiles_gui(vector<StringMap> files, bool firstUpdate)234void DownloadQueue::addFiles_gui(vector<StringMap> files, bool firstUpdate)
@@ -1237,6 +1237,7 @@
1237 string nick;1237 string nick;
1238 map<string, string> source;1238 map<string, string> source;
1239 int online = 0;1239 int online = 0;
1240 int totalSources = item->getSources().size();
12401241
1241 params["Filename"] = item->getTargetFileName();1242 params["Filename"] = item->getTargetFileName();
1242 params["Path"] = Util::getFilePath(item->getTarget());1243 params["Path"] = Util::getFilePath(item->getTarget());
@@ -1261,7 +1262,7 @@
12611262
1262 // Status1263 // Status
1263 if (item->isWaiting())1264 if (item->isWaiting())
1264 params["Status"] = Util::toString(online) + _(" of ") + Util::toString(item->getSources().size()) + _(" user(s) online");1265 params["Status"] = P_("%1% of %2% user online", "%1% of %2% users online", % online % totalSources, totalSources);
1265 else 1266 else
1266 params["Status"] = _("Running...");1267 params["Status"] = _("Running...");
1267 1268
@@ -1269,8 +1270,8 @@
1269 params["Size Sort"] = Util::toString(item->getSize());1270 params["Size Sort"] = Util::toString(item->getSize());
1270 if (item->getSize() < 0)1271 if (item->getSize() < 0)
1271 {1272 {
1272 params["Size"] = _("Unknown");1273 params["Size"] = C_("Size", "Unknown");
1273 params["Exact Size"] = _("Unknown");1274 params["Exact Size"] = C_("Size", "Unknown");
1274 }1275 }
1275 else1276 else
1276 {1277 {
@@ -1294,22 +1295,22 @@
1294 switch (item->getPriority())1295 switch (item->getPriority())
1295 {1296 {
1296 case QueueItem::PAUSED:1297 case QueueItem::PAUSED:
1297 params["Priority"] = _("Paused");1298 params["Priority"] = C_("Priority", "Paused");
1298 break;1299 break;
1299 case QueueItem::LOWEST:1300 case QueueItem::LOWEST:
1300 params["Priority"] = _("Lowest");1301 params["Priority"] = C_("Priority", "Lowest");
1301 break;1302 break;
1302 case QueueItem::LOW:1303 case QueueItem::LOW:
1303 params["Priority"] = _("Low");1304 params["Priority"] = C_("Priority", "Low");
1304 break;1305 break;
1305 case QueueItem::HIGH:1306 case QueueItem::HIGH:
1306 params["Priority"] = _("High");1307 params["Priority"] = C_("Priority", "High");
1307 break;1308 break;
1308 case QueueItem::HIGHEST:1309 case QueueItem::HIGHEST:
1309 params["Priority"] = _("Highest");1310 params["Priority"] = C_("Priority", "Highest");
1310 break;1311 break;
1311 default:1312 default:
1312 params["Priority"] = _("Normal");1313 params["Priority"] = C_("Priority", "Normal");
1313 }1314 }
13141315
1315 // Error1316 // Error
13161317
=== modified file 'linux/downloadqueue.hh'
--- linux/downloadqueue.hh 2009-03-12 05:47:55 +0000
+++ linux/downloadqueue.hh 2011-01-25 05:38:26 +0000
@@ -22,6 +22,8 @@
22#ifndef WULFOR_DOWNLOAD_QUEUE_HH22#ifndef WULFOR_DOWNLOAD_QUEUE_HH
23#define WULFOR_DOWNLOAD_QUEUE_HH23#define WULFOR_DOWNLOAD_QUEUE_HH
2424
25#include "IntlUtil.hh"
26
25#include <dcpp/stdinc.h>27#include <dcpp/stdinc.h>
26#include <dcpp/DCPlusPlus.h>28#include <dcpp/DCPlusPlus.h>
27#include <dcpp/QueueManager.h>29#include <dcpp/QueueManager.h>
2830
=== modified file 'linux/entry.hh'
--- linux/entry.hh 2010-09-08 02:51:30 +0000
+++ linux/entry.hh 2011-01-25 05:38:26 +0000
@@ -25,7 +25,7 @@
25#include <gtk/gtk.h>25#include <gtk/gtk.h>
26#include <glade/glade.h>26#include <glade/glade.h>
27#include <gdk/gdkkeysyms.h>27#include <gdk/gdkkeysyms.h>
28#include <glib/gi18n.h>28#include "IntlUtil.hh"
29#include <string>29#include <string>
30#include <map>30#include <map>
3131
3232
=== modified file 'linux/favoritehubs.cc'
--- linux/favoritehubs.cc 2010-09-05 00:10:54 +0000
+++ linux/favoritehubs.cc 2011-01-25 05:38:26 +0000
@@ -43,14 +43,14 @@
4343
44 // Initialize favorite hub list treeview44 // Initialize favorite hub list treeview
45 favoriteView.setView(GTK_TREE_VIEW(getWidget("favoriteView")), TRUE, "favoritehubs");45 favoriteView.setView(GTK_TREE_VIEW(getWidget("favoriteView")), TRUE, "favoritehubs");
46 favoriteView.insertColumn("Auto Connect", G_TYPE_BOOLEAN, TreeView::BOOL, 100);46 favoriteView.insertColumn(N_("Auto Connect"), G_TYPE_BOOLEAN, TreeView::BOOL, 100);
47 favoriteView.insertColumn("Name", G_TYPE_STRING, TreeView::STRING, 150);47 favoriteView.insertColumn(N_("Name"), G_TYPE_STRING, TreeView::STRING, 150);
48 favoriteView.insertColumn("Description", G_TYPE_STRING, TreeView::STRING, 250);48 favoriteView.insertColumn(N_("Description"), G_TYPE_STRING, TreeView::STRING, 250);
49 favoriteView.insertColumn("Address", G_TYPE_STRING, TreeView::STRING, 175);49 favoriteView.insertColumn(N_("Address"), G_TYPE_STRING, TreeView::STRING, 175);
50 favoriteView.insertColumn("Username", G_TYPE_STRING, TreeView::STRING, 100);50 favoriteView.insertColumn(N_("Username"), G_TYPE_STRING, TreeView::STRING, 100);
51 favoriteView.insertColumn("Password", G_TYPE_STRING, TreeView::STRING, 100);51 favoriteView.insertColumn(N_("Password"), G_TYPE_STRING, TreeView::STRING, 100);
52 favoriteView.insertColumn("User Description", G_TYPE_STRING, TreeView::STRING, 125);52 favoriteView.insertColumn(N_("User Description"), G_TYPE_STRING, TreeView::STRING, 125);
53 favoriteView.insertColumn("Encoding", G_TYPE_STRING, TreeView::STRING, 125);53 favoriteView.insertColumn(N_("Encoding"), G_TYPE_STRING, TreeView::STRING, 125);
54 favoriteView.insertHiddenColumn("Hidden Password", G_TYPE_STRING);54 favoriteView.insertHiddenColumn("Hidden Password", G_TYPE_STRING);
55 favoriteView.finalize();55 favoriteView.finalize();
56 favoriteStore = gtk_list_store_newv(favoriteView.getColCount(), favoriteView.getGTypes());56 favoriteStore = gtk_list_store_newv(favoriteView.getColCount(), favoriteView.getGTypes());
@@ -375,17 +375,11 @@
375 {375 {
376 if (BOOLSETTING(CONFIRM_HUB_REMOVAL))376 if (BOOLSETTING(CONFIRM_HUB_REMOVAL))
377 {377 {
378 string name = fh->favoriteView.getString(&iter, "Name").c_str();378 GtkWidget *confirmDeletionDialog = fh->getWidget("confirmDeletionDialog");
379 GtkWindow* parent = GTK_WINDOW(WulforManager::get()->getMainWindow()->getContainer());379 gint response = gtk_dialog_run(GTK_DIALOG(confirmDeletionDialog));
380 GtkWidget* dialog = gtk_message_dialog_new(parent,380 gtk_widget_hide(fh->getWidget("confirmDeletionDialog"));
381 GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
382 _("Are you sure you want to delete favorite hub \"%s\"?"), name.c_str());
383 gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_REMOVE, GTK_RESPONSE_YES, NULL);
384 gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog), GTK_RESPONSE_YES, GTK_RESPONSE_CANCEL, -1);
385 gint response = gtk_dialog_run(GTK_DIALOG(dialog));
386 gtk_widget_destroy(dialog);
387381
388 if (response != GTK_RESPONSE_YES)382 if (response != GTK_RESPONSE_OK)
389 return;383 return;
390 }384 }
391385
392386
=== modified file 'linux/favoriteusers.cc'
--- linux/favoriteusers.cc 2010-09-05 00:10:54 +0000
+++ linux/favoriteusers.cc 2011-01-25 05:38:26 +0000
@@ -38,12 +38,12 @@
3838
39 // Initialize favorite users list treeview39 // Initialize favorite users list treeview
40 favoriteUserView.setView(GTK_TREE_VIEW(getWidget("favoriteUserView")), TRUE, "favoriteusers");40 favoriteUserView.setView(GTK_TREE_VIEW(getWidget("favoriteUserView")), TRUE, "favoriteusers");
41 favoriteUserView.insertColumn(_("Auto Grant Slot"), G_TYPE_BOOLEAN, TreeView::BOOL, 120);41 favoriteUserView.insertColumn(N_("Auto Grant Slot"), G_TYPE_BOOLEAN, TreeView::BOOL, 120);
42 favoriteUserView.insertColumn(_("User"), G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");42 favoriteUserView.insertColumn(N_("User"), G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
43 favoriteUserView.insertColumn(_("Most Recent Hub"), G_TYPE_STRING, TreeView::STRING, 200);43 favoriteUserView.insertColumn(N_("Most Recent Hub"), G_TYPE_STRING, TreeView::STRING, 200);
44 favoriteUserView.insertColumn(_("Time Last Seen"), G_TYPE_STRING, TreeView::STRING, 120);44 favoriteUserView.insertColumn(N_("Time Last Seen"), G_TYPE_STRING, TreeView::STRING, 120);
45 favoriteUserView.insertColumn(_("Description"), G_TYPE_STRING, TreeView::STRING, 150);45 favoriteUserView.insertColumn(N_("Description"), G_TYPE_STRING, TreeView::STRING, 150);
46 favoriteUserView.insertColumn("CID", G_TYPE_STRING, TreeView::STRING, 350);46 favoriteUserView.insertColumn(N_("CID"), G_TYPE_STRING, TreeView::STRING, 350);
47 favoriteUserView.insertHiddenColumn("URL", G_TYPE_STRING);47 favoriteUserView.insertHiddenColumn("URL", G_TYPE_STRING);
48 favoriteUserView.insertHiddenColumn("Icon", G_TYPE_STRING);48 favoriteUserView.insertHiddenColumn("Icon", G_TYPE_STRING);
49 favoriteUserView.finalize();49 favoriteUserView.finalize();
@@ -54,12 +54,12 @@
5454
55 favoriteUserSelection = gtk_tree_view_get_selection(favoriteUserView.get());55 favoriteUserSelection = gtk_tree_view_get_selection(favoriteUserView.get());
56 gtk_tree_selection_set_mode(favoriteUserSelection, GTK_SELECTION_MULTIPLE);56 gtk_tree_selection_set_mode(favoriteUserSelection, GTK_SELECTION_MULTIPLE);
57 gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(favoriteUserStore), favoriteUserView.col(_("User")), GTK_SORT_ASCENDING);57 gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(favoriteUserStore), favoriteUserView.col("User"), GTK_SORT_ASCENDING);
58 gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(favoriteUserView.get(), favoriteUserView.col(_("User"))), TRUE);58 gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(favoriteUserView.get(), favoriteUserView.col("User")), TRUE);
59 gtk_tree_view_set_fixed_height_mode(favoriteUserView.get(), TRUE);59 gtk_tree_view_set_fixed_height_mode(favoriteUserView.get(), TRUE);
6060
61 GList *list = gtk_tree_view_column_get_cell_renderers(gtk_tree_view_get_column(favoriteUserView.get(),61 GList *list = gtk_tree_view_column_get_cell_renderers(gtk_tree_view_get_column(favoriteUserView.get(),
62 favoriteUserView.col(_("Auto Grant Slot"))));62 favoriteUserView.col("Auto Grant Slot")));
63 GObject *renderer = (GObject *)g_list_nth_data(list, 0);63 GObject *renderer = (GObject *)g_list_nth_data(list, 0);
64 g_signal_connect(renderer, "toggled", G_CALLBACK(onAutoGrantSlotToggled_gui), (gpointer)this);64 g_signal_connect(renderer, "toggled", G_CALLBACK(onAutoGrantSlotToggled_gui), (gpointer)this);
65 g_list_free(list);65 g_list_free(list);
@@ -96,16 +96,16 @@
96 const FavoriteUser &user = it->second;96 const FavoriteUser &user = it->second;
97 bool online = user.getUser()->isOnline();97 bool online = user.getUser()->isOnline();
98 string hub = online ? WulforUtil::getHubNames(user.getUser()) : user.getUrl();98 string hub = online ? WulforUtil::getHubNames(user.getUser()) : user.getUrl();
99 string seen = online ? _("Online") : Util::formatTime("%Y-%m-%d %H:%M", user.getLastSeen());99 string seen = online ? C_("User", "Online") : Util::formatTime("%Y-%m-%d %H:%M", user.getLastSeen());
100 string cid = user.getUser()->getCID().toBase32();100 string cid = user.getUser()->getCID().toBase32();
101101
102 gtk_list_store_append(favoriteUserStore, &iter);102 gtk_list_store_append(favoriteUserStore, &iter);
103 gtk_list_store_set(favoriteUserStore, &iter,103 gtk_list_store_set(favoriteUserStore, &iter,
104 favoriteUserView.col(_("Auto Grant Slot")), user.isSet(FavoriteUser::FLAG_GRANTSLOT) ? TRUE : FALSE,
105 favoriteUserView.col(_("User")), user.getNick().c_str(),
106 favoriteUserView.col(_("Most Recent Hub")), hub.c_str(),
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to status/vote changes: